diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-08-10 14:23:50 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-10 15:56:54 +0200 |
commit | 3944162039d9cea30384a0d867afab35cc3bfabf (patch) | |
tree | ec07f797055a69823f47edff588f5dc82a1dfeca /src/plugins/qmldesigner/assetexporterplugin | |
parent | 84e4b3af31364973c44ad52c8c01430d42f996a4 (diff) | |
parent | acadee710e00cca55736db864263bdcdcbac31a6 (diff) |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
src/plugins/cmakeprojectmanager/cmakebuildstep.h
tests/auto/debugger/tst_namedemangler.cpp
tests/auto/qml/codemodel/check/tst_check.cpp
Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
Diffstat (limited to 'src/plugins/qmldesigner/assetexporterplugin')
-rw-r--r-- | src/plugins/qmldesigner/assetexporterplugin/filepathmodel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.h b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.h index 91a800c036..0921e71864 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.h +++ b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.h @@ -38,6 +38,8 @@ class Project; namespace QmlDesigner { class FilePathModel : public QAbstractListModel { + Q_DECLARE_TR_FUNCTIONS(QmlDesigner::FilePathModel) + public: FilePathModel(ProjectExplorer::Project *project, QObject *parent = nullptr); ~FilePathModel() override; |