From f7ca927b6853557076280de5dde3e43c06dcd56a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Oct 2011 19:37:07 +0200 Subject: [PATCH] compile with Visual Studio IDE, take 2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7 Reviewed-by: Robert Löhning Reviewed-by: Eike Ziller --- qtcreator.pri | 8 ++++++-- src/libs/extensionsystem/extensionsystem.pro | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index a5fc6fce29..3bfcfc0d51 100644 --- 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 3d9b36c44c..9a0937742f 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\\\" +!isEmpty(vcproj) { + DEFINES += IDE_TEST_DIR=\"$$IDE_SOURCE_TREE\" +} else { + DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\" +} HEADERS += pluginerrorview.h \ plugindetailsview.h \ -- 2.11.0