diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
| commit | 81cce8902ee0383c57d90792e5dd52fe5d7f0b84 (patch) | |
| tree | 0ff6facd20b82a61803b1f8d22d3576aa0016469 /src/plugins/plugins.pro | |
| parent | 2ee0b36342446dd8816480d849138496321b154a (diff) | |
| parent | 5dcf7d2ef03827329e2d57ac33ac391abf278d57 (diff) | |
| download | qt-creator-81cce8902ee0383c57d90792e5dd52fe5d7f0b84.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljscheck.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 9f7e3bf423..ef284bdce7 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 \ @@ -46,8 +45,14 @@ SUBDIRS = plugin_coreplugin \ plugin_remotelinux \ plugin_madde \ plugin_qttest \ - 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 |