Skip to content

Commit

Permalink
fix interference with templateselector.h
Browse files Browse the repository at this point in the history
```
/home/runner/work/texstudio/texstudio/texstudio_autogen/UVLADIE3JM/../../src/templateselector.h:110:1: error: redefinition of ‘struct QMetaTypeId<QTreeWidgetItem*>’
  110 | Q_DECLARE_METATYPE(QTreeWidgetItem *)
      | ^~~~~~~~~~~~~~~~~~
/home/runner/work/texstudio/texstudio/texstudio_autogen/UVLADIE3JM/../../src/macrobrowserui.h:51:1: note: previous definition of ‘struct QMetaTypeId<QTreeWidgetItem*>’
   51 | Q_DECLARE_METATYPE(QTreeWidgetItem *)
```
  • Loading branch information
octaeder committed Feb 29, 2024
1 parent 0a64567 commit 6abf003
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 3 additions & 0 deletions src/macrobrowserui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ const int MacroBrowserUI::FileRole = Qt::UserRole + 0;
const int MacroBrowserUI::UrlRole = Qt::UserRole + 1;
const int MacroBrowserUI::PathRole = Qt::UserRole + 2;
const int MacroBrowserUI::PopulatedRole = Qt::UserRole + 3;
#if QT_VERSION_MAJOR<6
Q_DECLARE_METATYPE(QTreeWidgetItem *)
#endif

MacroBrowserUI::MacroBrowserUI(QWidget *parent):QDialog (parent)
{
Expand Down
4 changes: 0 additions & 4 deletions src/macrobrowserui.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,4 @@ private slots:
QNetworkAccessManager *networkManager;
};

#if QT_VERSION_MAJOR<6
Q_DECLARE_METATYPE(QTreeWidgetItem *)
#endif

#endif // MACROBROWSERUI_H

0 comments on commit 6abf003

Please sign in to comment.