feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: fix that utils can be used in tests

Browse Source 
Change-Id: I1f530f3f63e22719de6faed7f55c66282d4044e8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2016-11-02 12:13:56 +01:00
parent 0e7103ede6
commit 7b70c30750
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/utils-lib.pri
View File

@@ -4,6 +4,15 @@ contains(CONFIG, dll) {
DEFINES += QTCREATOR_UTILS_STATIC_LIB
}
!win32:{
isEmpty(IDE_LIBEXEC_PATH) | isEmpty(IDE_BIN_PATH): {
warning("using utils-lib.pri without IDE_LIBEXEC_PATH or IDE_BIN_PATH results in empty QTC_REL_TOOLS_PATH")
DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"\")
} else {
DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")
}
}
QT += widgets gui network qml
CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*

2
src/libs/utils/utils.pro
View File

@@ -1,4 +1,2 @@
include(../../qtcreatorlibrary.pri)
include(utils-lib.pri)
DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")

2
tests/unit/unittest/creator_dependency.pri
View File

@@ -14,8 +14,6 @@ include($$PWD/../../../src/plugins/clangrefactoring/clangrefactoring-source.pri)
include(cplusplus.pri)
}
DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")
INCLUDEPATH += \
$$PWD/../../../src/libs \
$$PWD/../../../src/libs/3rdparty \