Skip to content
Snippets Groups Projects
Commit 54af55d0 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Joerg Bornemann
Browse files

Designer: Correctly include qt libs in qbs


Change-Id: I661db75fe2dae7a1fa9cb78bb086e559e8848ed1
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@nokia.com>
parent 2c7e68e6
No related branches found
No related tags found
No related merge requests found
...@@ -5,8 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin ...@@ -5,8 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "Designer" name: "Designer"
Depends { id: qtcore; name: "Qt.core" } Depends { name: "qt"; submodules: ['gui', 'xml', 'designer', 'designercomponents'] }
Depends { name: "qt"; submodules: ['gui', 'xml'] }
Depends { name: "utils" } Depends { name: "utils" }
Depends { name: "extensionsystem" } Depends { name: "extensionsystem" }
Depends { name: "aggregation" } Depends { name: "aggregation" }
...@@ -20,7 +19,6 @@ QtcPlugin { ...@@ -20,7 +19,6 @@ QtcPlugin {
cpp.defines: base.concat(["CPP_ENABLED"]) cpp.defines: base.concat(["CPP_ENABLED"])
cpp.includePaths: [ cpp.includePaths: [
"../../libs/3rdparty", "../../libs/3rdparty",
qtcore.qtPath + "/include/QtDesigner",
"cpp", "cpp",
"../../shared/designerintegrationv2", "../../shared/designerintegrationv2",
".", ".",
...@@ -28,7 +26,6 @@ QtcPlugin { ...@@ -28,7 +26,6 @@ QtcPlugin {
"../../libs", "../../libs",
buildDirectory buildDirectory
] ]
cpp.dynamicLibraries: ["QtDesigner", "QtDesignerComponents"]
files: [ files: [
"../../shared/designerintegrationv2/widgethost.h", "../../shared/designerintegrationv2/widgethost.h",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment