diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-03 09:49:32 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-03 13:38:49 +0000 |
| commit | 0f239f6c48b59c1f0c9a9b93558be6ec2482669a (patch) | |
| tree | c412f285fdfc59983a4ff9c05884d0ec49cce961 | |
| parent | 16bd822d1b600fadf01003f3cc1ac080956f672c (diff) | |
| download | qt-creator-0f239f6c48b59c1f0c9a9b93558be6ec2482669a.tar.gz | |
QML Designer: Link qtquickplugin against QtQml
Otherwise you cannot use the qtquickcompiler.
Fixes: QTBUG-80470
Change-Id: I6f03dddb79d17ee8a784831b91e46910909e3ec4
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro index 3be317a5e1..26c0af5acf 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro @@ -1,3 +1,5 @@ +QT += qml + include(../../../../qtcreator.pri)\ include(qtquickplugin.pri) include(../plugindestdir.pri) diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs index b6fdb2e14b..09245f424c 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs @@ -6,6 +6,8 @@ QtcProduct { installDir: qtc.ide_plugin_path + '/' + installDirName property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner" + Depends { name: "Qt.qml" } + cpp.defines: base.concat("QTQUICK_LIBRARY") cpp.includePaths: base.concat("../designercore/include") Properties { |