From 54af55d0f8e59acfde2f5ddcce8b276fea04b39a Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Mon, 27 Feb 2012 21:06:52 +0200
Subject: [PATCH] Designer: Correctly include qt libs in qbs
Change-Id: I661db75fe2dae7a1fa9cb78bb086e559e8848ed1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
src/plugins/designer/designer.qbs | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index c95ec345d6d..b1b08880f78 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -5,8 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Designer"
- Depends { id: qtcore; name: "Qt.core" }
- Depends { name: "qt"; submodules: ['gui', 'xml'] }
+ Depends { name: "qt"; submodules: ['gui', 'xml', 'designer', 'designercomponents'] }
Depends { name: "utils" }
Depends { name: "extensionsystem" }
Depends { name: "aggregation" }
@@ -20,7 +19,6 @@ QtcPlugin {
cpp.defines: base.concat(["CPP_ENABLED"])
cpp.includePaths: [
"../../libs/3rdparty",
- qtcore.qtPath + "/include/QtDesigner",
"cpp",
"../../shared/designerintegrationv2",
".",
@@ -28,7 +26,6 @@ QtcPlugin {
"../../libs",
buildDirectory
]
- cpp.dynamicLibraries: ["QtDesigner", "QtDesignerComponents"]
files: [
"../../shared/designerintegrationv2/widgethost.h",
--
GitLab