From 76a3007eebf8d20805ccc271c9fb7cc540ef0efe Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 16 Jul 2013 17:20:08 +0200 Subject: [PATCH] Compile ClearCase plugin on Mac but keep it disabled. Change-Id: I43f09324ad2502a64bb51c4b6cde337ebbe18132 Reviewed-by: Orgad Shaneh --- src/plugins/clearcase/ClearCase.pluginspec.in | 2 +- src/plugins/clearcase/clearcase.pro | 3 +++ src/plugins/clearcase/clearcase.qbs | 2 +- src/plugins/plugins.pro | 7 ++----- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/clearcase/ClearCase.pluginspec.in b/src/plugins/clearcase/ClearCase.pluginspec.in index 8ce53f4214..32a13f66df 100644 --- a/src/plugins/clearcase/ClearCase.pluginspec.in +++ b/src/plugins/clearcase/ClearCase.pluginspec.in @@ -1,4 +1,4 @@ - + AudioCodes (C) 2013 AudioCodes Ltd. diff --git a/src/plugins/clearcase/clearcase.pro b/src/plugins/clearcase/clearcase.pro index d4fa42c38b..21afe71021 100644 --- a/src/plugins/clearcase/clearcase.pro +++ b/src/plugins/clearcase/clearcase.pro @@ -1,5 +1,8 @@ # PROVIDER = AudioCodes +macx: CLEARCASE_DISABLED_STR = "true" +else: CLEARCASE_DISABLED_STR = "false" + include(../../qtcreatorplugin.pri) HEADERS += activityselector.h \ diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index bc8934029f..dcd94ac24c 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -6,7 +6,7 @@ QtcPlugin { name: "ClearCase" // provider: "AudioCodes" - condition: !qbs.targetOS.contains("osx") + pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")}) Depends { name: "Qt.widgets" } Depends { name: "Core" } diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 52855dd790..56194aa475 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -46,7 +46,8 @@ SUBDIRS = \ madde \ valgrind \ todo \ - qnx + qnx \ + clearcase exists(../shared/qbs/qbs.pro): \ SUBDIRS += \ @@ -61,10 +62,6 @@ isEmpty(IDE_PACKAGE_MODE) { updateinfo } -!macx: \ - SUBDIRS += \ - clearcase - contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) { SUBDIRS += \ qmlprojectmanager \ -- GitLab