From 37a64fb867bada4ef315e85e56cf23e4ae974d8d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 27 Mar 2013 17:14:40 +0100
Subject: [PATCH] factor out all library dependencies to _dependencies.pri
files
this makes it uniform for all libraries
Change-Id: I7a7665a2c74c8f212248c0400de04ca3eed1440a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/libs/aggregation/aggregation.pro | 1 +
src/libs/aggregation/aggregation_dependencies.pri | 0
src/libs/cplusplus/cplusplus.pro | 2 +-
src/libs/cplusplus/cplusplus_dependencies.pri | 1 +
src/libs/glsl/glsl.pro | 2 +-
src/libs/glsl/glsl_dependencies.pri | 1 +
src/libs/languageutils/languageutils.pro | 2 +-
src/libs/languageutils/languageutils_dependencies.pri | 1 +
src/libs/qmldebug/qmldebug.pro | 1 +
src/libs/qmldebug/qmldebug_dependencies.pri | 0
src/libs/qmleditorwidgets/qmleditorwidgets.pro | 3 +--
src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri | 2 ++
src/libs/qmljs/qmljs.pro | 3 +--
src/libs/qmljs/qmljs_dependencies.pri | 2 ++
src/libs/zeroconf/zeroconf.pro | 1 +
src/libs/zeroconf/zeroconf_dependencies.pri | 0
16 files changed, 15 insertions(+), 7 deletions(-)
create mode 100644 src/libs/aggregation/aggregation_dependencies.pri
create mode 100644 src/libs/cplusplus/cplusplus_dependencies.pri
create mode 100644 src/libs/glsl/glsl_dependencies.pri
create mode 100644 src/libs/languageutils/languageutils_dependencies.pri
create mode 100644 src/libs/qmldebug/qmldebug_dependencies.pri
create mode 100644 src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri
create mode 100644 src/libs/qmljs/qmljs_dependencies.pri
create mode 100644 src/libs/zeroconf/zeroconf_dependencies.pri
diff --git a/src/libs/aggregation/aggregation.pro b/src/libs/aggregation/aggregation.pro
index b601bbc0610..aa775a35553 100644
--- a/src/libs/aggregation/aggregation.pro
+++ b/src/libs/aggregation/aggregation.pro
@@ -2,6 +2,7 @@ TEMPLATE = lib
TARGET = Aggregation
include(../../qtcreatorlibrary.pri)
+include(aggregation_depedencies.pri)
DEFINES += AGGREGATION_LIBRARY
diff --git a/src/libs/aggregation/aggregation_dependencies.pri b/src/libs/aggregation/aggregation_dependencies.pri
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index 4c272c5a6f2..9b2672f8035 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -6,5 +6,5 @@ DEFINES += NDEBUG
unix:QMAKE_CXXFLAGS_DEBUG += -O2
include(../../qtcreatorlibrary.pri)
+include(cplusplus_dependencies.pri)
include(cplusplus-lib.pri)
-include(../languageutils/languageutils.pri)
diff --git a/src/libs/cplusplus/cplusplus_dependencies.pri b/src/libs/cplusplus/cplusplus_dependencies.pri
new file mode 100644
index 00000000000..83e147c1579
--- /dev/null
+++ b/src/libs/cplusplus/cplusplus_dependencies.pri
@@ -0,0 +1 @@
+include(../languageutils/languageutils.pri)
diff --git a/src/libs/glsl/glsl.pro b/src/libs/glsl/glsl.pro
index 2268ab55f7b..1baa6eb1032 100644
--- a/src/libs/glsl/glsl.pro
+++ b/src/libs/glsl/glsl.pro
@@ -5,5 +5,5 @@ DEFINES += \
QT_CREATOR
include(../../qtcreatorlibrary.pri)
+include(glsl_dependencies.pri)
include(glsl-lib.pri)
-include(../utils/utils.pri)
diff --git a/src/libs/glsl/glsl_dependencies.pri b/src/libs/glsl/glsl_dependencies.pri
new file mode 100644
index 00000000000..5e1db77cc93
--- /dev/null
+++ b/src/libs/glsl/glsl_dependencies.pri
@@ -0,0 +1 @@
+include(../utils/utils.pri)
diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro
index ecf48889224..10454168f83 100644
--- a/src/libs/languageutils/languageutils.pro
+++ b/src/libs/languageutils/languageutils.pro
@@ -5,5 +5,5 @@ DEFINES += QT_CREATOR
unix:QMAKE_CXXFLAGS_DEBUG += -O3
include(../../qtcreatorlibrary.pri)
+include(languageutils_dependencies.pri)
include(languageutils-lib.pri)
-include(../utils/utils.pri)
diff --git a/src/libs/languageutils/languageutils_dependencies.pri b/src/libs/languageutils/languageutils_dependencies.pri
new file mode 100644
index 00000000000..5e1db77cc93
--- /dev/null
+++ b/src/libs/languageutils/languageutils_dependencies.pri
@@ -0,0 +1 @@
+include(../utils/utils.pri)
diff --git a/src/libs/qmldebug/qmldebug.pro b/src/libs/qmldebug/qmldebug.pro
index 26a1a408566..aa9df75faa3 100644
--- a/src/libs/qmldebug/qmldebug.pro
+++ b/src/libs/qmldebug/qmldebug.pro
@@ -3,6 +3,7 @@ TARGET = QmlDebug
QT += network
include(../../qtcreatorlibrary.pri)
+include(qmldebug_dependencies.pri)
include(qmldebug-lib.pri)
OTHER_FILES += \
diff --git a/src/libs/qmldebug/qmldebug_dependencies.pri b/src/libs/qmldebug/qmldebug_dependencies.pri
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pro b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
index 99eced93756..f157fcb5812 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.pro
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
@@ -6,7 +6,6 @@ DEFINES += QWEAKPOINTER_ENABLE_ARROW
unix:QMAKE_CXXFLAGS_DEBUG += -O3
include(../../qtcreatorlibrary.pri)
-include(../qmljs/qmljs.pri)
-include(../utils/utils.pri)
+include(qmleditorwidgets_dependencies.pri)
include(qmleditorwidgets-lib.pri)
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri b/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri
new file mode 100644
index 00000000000..7772b49acb2
--- /dev/null
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri
@@ -0,0 +1,2 @@
+include(../qmljs/qmljs.pri)
+include(../utils/utils.pri)
diff --git a/src/libs/qmljs/qmljs.pro b/src/libs/qmljs/qmljs.pro
index 7c93645b8c5..2f38f35ed6c 100644
--- a/src/libs/qmljs/qmljs.pro
+++ b/src/libs/qmljs/qmljs.pro
@@ -4,6 +4,5 @@ DEFINES += QMLJS_BUILD_DIR QT_CREATOR
QT +=script
include(../../qtcreatorlibrary.pri)
+include(qmljs_dependencies.pri)
include(qmljs-lib.pri)
-include(../utils/utils.pri)
-include(../languageutils/languageutils.pri)
diff --git a/src/libs/qmljs/qmljs_dependencies.pri b/src/libs/qmljs/qmljs_dependencies.pri
new file mode 100644
index 00000000000..6a261f76ef0
--- /dev/null
+++ b/src/libs/qmljs/qmljs_dependencies.pri
@@ -0,0 +1,2 @@
+include(../utils/utils.pri)
+include(../languageutils/languageutils.pri)
diff --git a/src/libs/zeroconf/zeroconf.pro b/src/libs/zeroconf/zeroconf.pro
index 0d5c07b31cc..20051ad061c 100644
--- a/src/libs/zeroconf/zeroconf.pro
+++ b/src/libs/zeroconf/zeroconf.pro
@@ -21,6 +21,7 @@ HEADERS += servicebrowser.h \
syssocket.h
include(../../qtcreatorlibrary.pri)
+include(zeroconf_dependencies.pri)
win32{
LIBS += -lws2_32
diff --git a/src/libs/zeroconf/zeroconf_dependencies.pri b/src/libs/zeroconf/zeroconf_dependencies.pri
new file mode 100644
index 00000000000..e69de29bb2d
--
GitLab