From 1f4af6a77880b996307b17cab05004830a11c12c Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Tue, 24 Nov 2015 12:18:35 +0100
Subject: [PATCH] Utils: Specify LIBS in utils-lib.pri
...so that unittest.pro compiles on MSVC2013 without duplicating the LIBS line.
Change-Id: I2a4f9cab65620ea28692d17352e92ababc47e4fd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
src/libs/utils/utils-lib.pri | 4 ++++
src/libs/utils/utils.pro | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 9c5be39c030..cf45860794f 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -8,6 +8,10 @@ QT += gui network qml
CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
+win32: LIBS += -luser32 -lshell32
+# PortsGatherer
+win32: LIBS += -liphlpapi -lws2_32
+
SOURCES += $$PWD/environment.cpp \
$$PWD/environmentmodel.cpp \
$$PWD/qtcprocess.cpp \
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 83d61eac6df..b3f2f208928 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -1,8 +1,4 @@
include(../../qtcreatorlibrary.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)\")
--
GitLab