From fe80df7e2ffb9ca334723d13af749c7b3dc973a8 Mon Sep 17 00:00:00 2001
From: Peter Kuemmel <syntheticpp@gmx.net>
Date: Mon, 17 Oct 2011 11:28:28 +0200
Subject: [PATCH] Compile with Visual Studio IDE: string macros don't need to
be escaped
Merge-request: 400
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I81f335b44fe736f3ffc9ba3212de25edf8589dd1
---
qtcreator.pri | 7 +++++--
src/libs/extensionsystem/extensionsystem.pro | 6 +++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index e4b262fd16b..6668a78080b 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -75,8 +75,11 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib
}
-
-DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+win32-msvc* {
+ DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
+} else {
+ DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+}
equals(TEST, 1) {
QT +=testlib
diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index 3d9b36c44c3..42b5ef41405 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -6,7 +6,11 @@ include(extensionsystem_dependencies.pri)
unix:!macx:!freebsd*:LIBS += -ldl
-DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
+win32-msvc* {
+ DEFINES += IDE_TEST_DIR=\"$$IDE_SOURCE_TREE\"
+} else {
+ DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
+}
HEADERS += pluginerrorview.h \
plugindetailsview.h \
--
GitLab