diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-03 16:07:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-03 16:08:02 +0200 |
| commit | 49db3a450a6d15ae0327b8e3713920ac19320972 (patch) | |
| tree | 309c83eb1dbb6321845d6a1db8fbc49428b20340 /src/plugins/plugins.pro | |
| parent | afd56bd8ada761b87c40d80a07cd3b3766b2d2f8 (diff) | |
| parent | d030a960a0e6e1dda89e20b60e5252842fe83f49 (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cppeditor/cppeditor.cpp
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
src/plugins/texteditor/basetexteditor.cpp
Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 92ee74b3fad..79103a7f068 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -69,11 +69,11 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) isEmpty(IDE_PACKAGE_MODE) { SUBDIRS += \ - helloworld \ - updateinfo -} else:!isEmpty(UPDATEINFO_ENABLE) { - SUBDIRS += \ - updateinfo + helloworld #\ + #updateinfo +#} else:!isEmpty(UPDATEINFO_ENABLE) { +# SUBDIRS += \ +# updateinfo } for(p, SUBDIRS) { |