summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-10-13 17:13:47 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-10-13 16:05:16 +0000
commit66ada45ce571868332c6d914b345765bf5f50db5 (patch)
tree9e1aeef5dcea4d52a258f8a892c4880d82c1ff14
parent98b57c1162966cc47642a728768695656c317798 (diff)
downloadqt-creator-66ada45ce571868332c6d914b345765bf5f50db5.tar.gz
Utils: State Qt dependencies in the *.pri file
...to avoid compilation errors for projects that include the *.pri file. This fixed the compilation of tests/unit/unittest/unittest.pro. Change-Id: Ia50322d3a7b7a9d05b7f17239e772f013ffe2ff5 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
-rw-r--r--src/libs/utils/utils-lib.pri2
-rw-r--r--src/libs/utils/utils.pro2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index bb66f7b5a5..ded0ca3cae 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -4,7 +4,7 @@ dll {
DEFINES += QTCREATOR_UTILS_STATIC_LIB
}
-QT += network
+QT += gui network qml
CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index d69ff0ff44..83d61eac6d 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -1,5 +1,3 @@
-QT += gui network qml
-
include(../../qtcreatorlibrary.pri)
include(utils-lib.pri)