diff options
| -rw-r--r-- | qbs/pluginspec/pluginspec.qbs | 8 | ||||
| -rw-r--r-- | qtcreator.qbp | 1 | ||||
| -rw-r--r-- | src/plugins/QtcPlugin.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/android/android.qbs | 85 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtsupport.qbs | 11 |
5 files changed, 105 insertions, 1 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 5dac760880..f587382506 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -11,6 +11,9 @@ Module { property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string destdir: product.destination + property var pluginspecreplacements: product.pluginspecreplacements + + FileTagger { pattern: "*.in" fileTags: ["pluginSpecIn"] @@ -37,9 +40,12 @@ Module { cmd.ide_version_major = product.module.ide_version_major; cmd.ide_version_minor = product.module.ide_version_minor; cmd.ide_version_release = product.module.ide_version_release; + + cmd.pluginspecreplacements = product.module.pluginspecreplacements; + cmd.sourceCode = function() { var i; - var vars = {}; + var vars = pluginspecreplacements || {}; var inf = new TextFile(input.fileName); var all = inf.readAll(); // replace quoted quotes diff --git a/qtcreator.qbp b/qtcreator.qbp index 196eaded36..f197c1d5fd 100644 --- a/qtcreator.qbp +++ b/qtcreator.qbp @@ -26,6 +26,7 @@ Project { "src/libs/utils/utils.qbs", "src/libs/zeroconf/zeroconf.qbs", "src/plugins/analyzerbase/analyzerbase.qbs", + "src/plugins/android/android.qbs", "src/plugins/bazaar/bazaar.qbs", "src/plugins/bineditor/bineditor.qbs", "src/plugins/bookmarks/bookmarks.qbs", diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index 8d4ca84bb1..239fb4712a 100644 --- a/src/plugins/QtcPlugin.qbs +++ b/src/plugins/QtcPlugin.qbs @@ -4,6 +4,7 @@ import qbs.fileinfo 1.0 as FileInfo Product { type: ["dynamiclibrary", "pluginSpec"] property string provider: 'Nokia' + property var pluginspecreplacements destination: "lib/qtcreator/plugins/" + provider targetName: { // see PluginSpecPrivate::loadLibrary() diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs new file mode 100644 index 0000000000..4949439503 --- /dev/null +++ b/src/plugins/android/android.qbs @@ -0,0 +1,85 @@ +import qbs.base 1.0 + +import "../QtcPlugin.qbs" as QtcPlugin + +QtcPlugin { + name: "Android" + + Depends { name: "Core" } + Depends { name: "ProjectExplorer" } + Depends { name: "Qt4ProjectManager" } + Depends { name: "Debugger" } + Depends { name: "QtSupport" } + Depends { name: "qt"; submodules: ['widgets', 'xml', 'network'] } + + property bool enable: false + property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")}) + + cpp.includePaths: [ + "..", + buildDirectory, + "../../libs", + "../../shared" + ] + + files: [ + "addnewavddialog.ui", + "androidconfigurations.cpp", + "androidconfigurations.h", + "androidconstants.h", + "androidcreatekeystorecertificate.cpp", + "androidcreatekeystorecertificate.h", + "androidcreatekeystorecertificate.ui", + "androiddebugsupport.cpp", + "androiddebugsupport.h", + "androiddeployconfiguration.cpp", + "androiddeployconfiguration.h", + "androiddeploystep.cpp", + "androiddeploystepfactory.cpp", + "androiddeploystepfactory.h", + "androiddeploystep.h", + "androiddeploystepwidget.cpp", + "androiddeploystepwidget.h", + "androiddeploystepwidget.ui", + "androidglobal.h", + "androidpackagecreationfactory.cpp", + "androidpackagecreationfactory.h", + "androidpackagecreationstep.cpp", + "androidpackagecreationstep.h", + "androidpackagecreationwidget.cpp", + "androidpackagecreationwidget.h", + "androidpackagecreationwidget.ui", + "androidpackageinstallationfactory.cpp", + "androidpackageinstallationfactory.h", + "androidpackageinstallationstep.cpp", + "androidpackageinstallationstep.h", + "androidplugin.cpp", + "androidplugin.h", + "android.qrc", + "androidqtversion.cpp", + "androidqtversionfactory.cpp", + "androidqtversionfactory.h", + "androidqtversion.h", + "androidrunconfiguration.cpp", + "androidrunconfiguration.h", + "androidruncontrol.cpp", + "androidruncontrol.h", + "androidrunfactories.cpp", + "androidrunfactories.h", + "androidrunner.cpp", + "androidrunner.h", + "androidsettingspage.cpp", + "androidsettingspage.h", + "androidsettingswidget.cpp", + "androidsettingswidget.h", + "androidsettingswidget.ui", + "androidtarget.cpp", + "androidtargetfactory.cpp", + "androidtargetfactory.h", + "androidtarget.h", + "androidtoolchain.cpp", + "androidtoolchain.h", + "javaparser.cpp", + "javaparser.h" + ] +} diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index dea0980077..d078834e68 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -81,5 +81,16 @@ QtcPlugin { "qtversionfactory.cpp", "qtversionmanager.cpp" ] + + ProductModule { + Depends { name: "cpp" } + cpp.defines: [ + "PROPARSER_AS_LIBRARY", + "PROPARSER_LIBRARY", + "PROPARSER_THREAD_SAFE", + "PROEVALUATOR_THREAD_SAFE", + "PROEVALUATOR_CUMULATIVE" + ] + } } |