diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-09-11 14:02:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-09-11 14:02:03 +0200 |
| commit | 5ac721dd5824f2bb26b9c31148c598a1235c039a (patch) | |
| tree | ad3374c846289cc3095b8c4b8354eb55d58fd387 /src/libs/utils/utils.pro | |
| parent | d09b83c28d2b56b90497e80adc9e98f9c5acec08 (diff) | |
| parent | fa094b226148fa8a6da0036ecc15b7bf6b11cbf6 (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbp
src/libs/utils/utils.pro
Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
Diffstat (limited to 'src/libs/utils/utils.pro')
| -rw-r--r-- | src/libs/utils/utils.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index 1a55802ead9..9f5d56d644a 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -12,6 +12,6 @@ lessThan(QT_MAJOR_VERSION, 5) { win32:include(../../private_headers.pri) } -win32: LIBS += -lUser32 +win32: LIBS += -luser32 # PortsGatherer -win32: LIBS += -liphlpapi -lWs2_32 +win32: LIBS += -liphlpapi -lws2_32 |