diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-10-25 18:38:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-26 12:58:36 +0200 |
| commit | fd07e113142db93433592ff0a0f56e50446c9a2d (patch) | |
| tree | 603228774a61a9e37608fa79a2b02c9fc3015108 | |
| parent | 26b7b87774fa0dece2226faa2819931f3b9442cc (diff) | |
| download | qt-creator-fd07e113142db93433592ff0a0f56e50446c9a2d.tar.gz | |
Do not include certain plugins when compiling
Certain plugins (example, updateinfo) should not be included
in a binary release, but we want to provide & build them by
default to ensure they still compile.
Defining the qmake variable IDE_PACKAGE_MODE will skip
them in the build process.
To still enable the UpdateInfo plugin, also define UPDATEINFO_ENABLE.
Change-Id: I256467edfd1e6ec272562e68e9ef19599e864185
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -rw-r--r-- | src/plugins/plugins.pro | 12 | ||||
| -rw-r--r-- | src/plugins/updateinfo/UpdateInfo.pluginspec.in | 2 | ||||
| -rw-r--r-- | src/plugins/updateinfo/updateinfo.pro | 9 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 6abd99df97..a1a6f80359 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -23,7 +23,6 @@ SUBDIRS = plugin_coreplugin \ plugin_locator \ plugin_debugger \ # plugin_qtestlib \ # this seems to be dead - plugin_helloworld \ # sample plugin plugin_help \ # plugin_regexp \ # don't know what to do with this plugin_cpaster \ @@ -45,8 +44,15 @@ SUBDIRS = plugin_coreplugin \ plugin_qmlprofiler \ plugin_remotelinux \ plugin_madde \ - plugin_valgrind \ - plugin_updateinfo + plugin_valgrind + +isEmpty(IDE_PACKAGE_MODE) { + SUBDIRS += plugin_helloworld \ + plugin_updateinfo +} else:!isEmpty(UPDATEINFO_ENABLE) { + SUBDIRS += plugin_updateinfo +} + linux-* { SUBDIRS += debugger/ptracepreload.pro diff --git a/src/plugins/updateinfo/UpdateInfo.pluginspec.in b/src/plugins/updateinfo/UpdateInfo.pluginspec.in index 89ce6f0c77..c35b64cb64 100644 --- a/src/plugins/updateinfo/UpdateInfo.pluginspec.in +++ b/src/plugins/updateinfo/UpdateInfo.pluginspec.in @@ -1,4 +1,4 @@ -<plugin name=\"UpdateInfo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"$$UPDATEINFO_DISABLE\"> +<plugin name=\"UpdateInfo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"$$UPDATEINFO_EXPERIMENTAL_STR\"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2011 Nokia Corporation</copyright> <license> diff --git a/src/plugins/updateinfo/updateinfo.pro b/src/plugins/updateinfo/updateinfo.pro index 880217a8df..fb3a2b3118 100644 --- a/src/plugins/updateinfo/updateinfo.pro +++ b/src/plugins/updateinfo/updateinfo.pro @@ -6,15 +6,10 @@ HEADERS += updateinfoplugin.h \ updateinfobutton.h SOURCES += updateinfoplugin.cpp \ updateinfobutton.cpp -FORMS += RESOURCES += updateinfo.qrc -PROVIDER = Nokia - -isEmpty(UPDATEINFO_DISABLE):UPDATEINFO_DISABLE=$$(UPDATEINFO_DISABLE) -isEmpty(UPDATEINFO_DISABLE):UPDATEINFO_DISABLE = "true" -else:UPDATEINFO_DISABLE = "false" +isEmpty(UPDATEINFO_ENABLE):UPDATEINFO_EXPERIMENTAL_STR="true" +else:UPDATEINFO_EXPERIMENTAL_STR="false" include(../../qtcreatorplugin.pri) - include(updateinfo_dependencies.pri) |