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

Utils: Specify LIBS in utils-lib.pri

Browse Source 
...so that unittest.pro compiles on MSVC2013 without duplicating the LIBS line.

Change-Id: I2a4f9cab65620ea28692d17352e92ababc47e4fd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-11-24 12:18:35 +01:00
parent 8c3959534d
commit 1f4af6a778
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,10 @@ QT += gui network qml
CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/* CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
win32: LIBS += -luser32 -lshell32
# PortsGatherer
win32: LIBS += -liphlpapi -lws2_32
SOURCES += $$PWD/environment.cpp \ SOURCES += $$PWD/environment.cpp \
$$PWD/environmentmodel.cpp \ $$PWD/environmentmodel.cpp \
$$PWD/qtcprocess.cpp \ $$PWD/qtcprocess.cpp \

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

@@ -1,8 +1,4 @@
include(../../qtcreatorlibrary.pri) include(../../qtcreatorlibrary.pri)
include(utils-lib.pri) include(utils-lib.pri)
win32: LIBS += -luser32 -lshell32
# PortsGatherer
win32: LIBS += -liphlpapi -lws2_32
DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\") DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")