compile with Visual Studio IDE, take 2

Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

diff --git a/qtcreator.pri b/qtcreator.pri
index a5fc6fc..3bfcfc0 100644 (file)
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -76,8 +76,6 @@ isEmpty(IDE_LIBRARY_BASENAME) {
     IDE_LIBRARY_BASENAME = lib
 }
 
-DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
-
 equals(TEST, 1) {
     QT +=testlib
     DEFINES += WITH_TESTS
@@ -128,6 +126,12 @@ CONFIG += depend_includepath
 
 LIBS += -L$$IDE_LIBRARY_PATH
 
+!isEmpty(vcproj) {
+    DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
+} else {
+    DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+}
+
 #DEFINES += QT_NO_CAST_FROM_ASCII
 DEFINES += QT_NO_CAST_TO_ASCII
 !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION

diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index 3d9b36c..9a09377 100644 (file)
--- 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\\\"
+!isEmpty(vcproj) {
+    DEFINES += IDE_TEST_DIR=\"$$IDE_SOURCE_TREE\"
+} else {
+    DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
+}
 
 HEADERS += pluginerrorview.h \
     plugindetailsview.h \