diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-25 19:09:49 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-03 14:37:45 +0200 |
| commit | 66a3553107a43f56372f756b218e268e71390d19 (patch) | |
| tree | 8e3f7d31f29d3760ba450f7ed6caf4da6ebed12f /src/libs | |
| parent | c320f65d1cd58f86061c09cf5992603e26af5871 (diff) | |
| download | qt-creator-66a3553107a43f56372f756b218e268e71390d19.tar.gz | |
make library and plugin dependencies declarative
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/libs')
22 files changed, 25 insertions, 23 deletions
diff --git a/src/libs/aggregation/aggregation.pri b/src/libs/aggregation/aggregation.pri deleted file mode 100644 index fc6ddc81f5..0000000000 --- a/src/libs/aggregation/aggregation.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(Aggregation) diff --git a/src/libs/aggregation/aggregation_dependencies.pri b/src/libs/aggregation/aggregation_dependencies.pri index e69de29bb2..8e5082c68e 100644 --- a/src/libs/aggregation/aggregation_dependencies.pri +++ b/src/libs/aggregation/aggregation_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = Aggregation diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri deleted file mode 100644 index d17ace592e..0000000000 --- a/src/libs/cplusplus/cplusplus.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(CPlusPlus) diff --git a/src/libs/cplusplus/cplusplus_dependencies.pri b/src/libs/cplusplus/cplusplus_dependencies.pri index 7b3d3dcf31..0f89e4fabc 100644 --- a/src/libs/cplusplus/cplusplus_dependencies.pri +++ b/src/libs/cplusplus/cplusplus_dependencies.pri @@ -1,2 +1,4 @@ -include(../languageutils/languageutils.pri) +QTC_LIB_NAME = CPlusPlus +QTC_LIB_DEPENDS += \ + languageutils INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty diff --git a/src/libs/extensionsystem/extensionsystem.pri b/src/libs/extensionsystem/extensionsystem.pri deleted file mode 100644 index 4c7641b9cb..0000000000 --- a/src/libs/extensionsystem/extensionsystem.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(extensionsystem_dependencies.pri) - -LIBS *= -l$$qtLibraryName(ExtensionSystem) diff --git a/src/libs/extensionsystem/extensionsystem_dependencies.pri b/src/libs/extensionsystem/extensionsystem_dependencies.pri index 63b2e339a3..1bbf1de4ec 100644 --- a/src/libs/extensionsystem/extensionsystem_dependencies.pri +++ b/src/libs/extensionsystem/extensionsystem_dependencies.pri @@ -1 +1,3 @@ -include(../aggregation/aggregation.pri) +QTC_LIB_NAME = ExtensionSystem +QTC_LIB_DEPENDS += \ + aggregation diff --git a/src/libs/glsl/glsl.pri b/src/libs/glsl/glsl.pri deleted file mode 100644 index b6de9eab22..0000000000 --- a/src/libs/glsl/glsl.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(GLSL) diff --git a/src/libs/glsl/glsl_dependencies.pri b/src/libs/glsl/glsl_dependencies.pri index 5e1db77cc9..8615ff67f4 100644 --- a/src/libs/glsl/glsl_dependencies.pri +++ b/src/libs/glsl/glsl_dependencies.pri @@ -1 +1,3 @@ -include(../utils/utils.pri) +QTC_LIB_NAME = GLSL +QTC_LIB_DEPENDS += \ + utils diff --git a/src/libs/languageutils/languageutils.pri b/src/libs/languageutils/languageutils.pri deleted file mode 100644 index 9709183d85..0000000000 --- a/src/libs/languageutils/languageutils.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(LanguageUtils) diff --git a/src/libs/languageutils/languageutils_dependencies.pri b/src/libs/languageutils/languageutils_dependencies.pri index 5e1db77cc9..3402e82d43 100644 --- a/src/libs/languageutils/languageutils_dependencies.pri +++ b/src/libs/languageutils/languageutils_dependencies.pri @@ -1 +1,3 @@ -include(../utils/utils.pri) +QTC_LIB_NAME = LanguageUtils +QTC_LIB_DEPENDS += \ + utils diff --git a/src/libs/qmldebug/qmldebug.pri b/src/libs/qmldebug/qmldebug.pri deleted file mode 100644 index c2b270a356..0000000000 --- a/src/libs/qmldebug/qmldebug.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QmlDebug) diff --git a/src/libs/qmldebug/qmldebug_dependencies.pri b/src/libs/qmldebug/qmldebug_dependencies.pri index e69de29bb2..a99b82c4ef 100644 --- a/src/libs/qmldebug/qmldebug_dependencies.pri +++ b/src/libs/qmldebug/qmldebug_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = QmlDebug diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri deleted file mode 100644 index ed951d503f..0000000000 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QmlEditorWidgets) diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri b/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri index 225c3daa0f..7768fffce8 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri @@ -1,3 +1,5 @@ -include(../qmljs/qmljs.pri) -include(../utils/utils.pri) +QTC_LIB_NAME = QmlEditorWidgets +QTC_LIB_DEPENDS += \ + qmljs \ + utils QT *= declarative diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri deleted file mode 100644 index 3cd320f3f6..0000000000 --- a/src/libs/qmljs/qmljs.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QmlJS) diff --git a/src/libs/qmljs/qmljs_dependencies.pri b/src/libs/qmljs/qmljs_dependencies.pri index 6a261f76ef..e1d1204148 100644 --- a/src/libs/qmljs/qmljs_dependencies.pri +++ b/src/libs/qmljs/qmljs_dependencies.pri @@ -1,2 +1,4 @@ -include(../utils/utils.pri) -include(../languageutils/languageutils.pri) +QTC_LIB_NAME = QmlJS +QTC_LIB_DEPENDS += \ + utils \ + languageutils diff --git a/src/libs/ssh/ssh.pri b/src/libs/ssh/ssh.pri deleted file mode 100644 index fe58b81cba..0000000000 --- a/src/libs/ssh/ssh.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(ssh_dependencies.pri) -LIBS *= -l$$qtLibraryName(QtcSsh) diff --git a/src/libs/ssh/ssh_dependencies.pri b/src/libs/ssh/ssh_dependencies.pri index e69de29bb2..ccd896a82c 100644 --- a/src/libs/ssh/ssh_dependencies.pri +++ b/src/libs/ssh/ssh_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = QtcSsh diff --git a/src/libs/utils/utils.pri b/src/libs/utils/utils.pri deleted file mode 100644 index 414ef2bd86..0000000000 --- a/src/libs/utils/utils.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(utils_dependencies.pri) -LIBS *= -l$$qtLibraryName(Utils) diff --git a/src/libs/utils/utils_dependencies.pri b/src/libs/utils/utils_dependencies.pri index e69de29bb2..4a18a7f018 100644 --- a/src/libs/utils/utils_dependencies.pri +++ b/src/libs/utils/utils_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = Utils diff --git a/src/libs/zeroconf/zeroconf.pri b/src/libs/zeroconf/zeroconf.pri deleted file mode 100644 index cf247ffeac..0000000000 --- a/src/libs/zeroconf/zeroconf.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(zeroconf) diff --git a/src/libs/zeroconf/zeroconf_dependencies.pri b/src/libs/zeroconf/zeroconf_dependencies.pri index e69de29bb2..9e8d0ea9bc 100644 --- a/src/libs/zeroconf/zeroconf_dependencies.pri +++ b/src/libs/zeroconf/zeroconf_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = zeroconf |