From 429d62823beef9c380d5f73778ca2f3944d59b8b Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Mon, 17 Oct 2011 15:23:00 +0200
Subject: [PATCH] Revert "Compile with Visual Studio IDE: string macros don't
need to be escaped"
This reverts commit fe80df7e2ffb9ca334723d13af749c7b3dc973a8.
With the above commit, Creator could not be compiled with MSVC 2008.
Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
qtcreator.pri | 7 ++-----
src/libs/extensionsystem/extensionsystem.pro | 6 +-----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index 6668a78080b..e4b262fd16b 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -75,11 +75,8 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib
}
-win32-msvc* {
- DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
-} else {
- DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
-}
+
+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 42b5ef41405..3d9b36c44c3 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -6,11 +6,7 @@ include(extensionsystem_dependencies.pri)
unix:!macx:!freebsd*:LIBS += -ldl
-win32-msvc* {
- DEFINES += IDE_TEST_DIR=\"$$IDE_SOURCE_TREE\"
-} else {
- DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
-}
+DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
HEADERS += pluginerrorview.h \
plugindetailsview.h \
--
GitLab