From 0f239f6c48b59c1f0c9a9b93558be6ec2482669a Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 3 Dec 2019 09:49:32 +0100 Subject: [PATCH] QML Designer: Link qtquickplugin against QtQml Otherwise you cannot use the qtquickcompiler. Fixes: QTBUG-80470 Change-Id: I6f03dddb79d17ee8a784831b91e46910909e3ec4 Reviewed-by: Liang Qi Reviewed-by: Mitch Curtis Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro | 2 ++ src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro index 3be317a5e16..26c0af5acf1 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 b6fdb2e14ba..09245f424c4 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 {