Commit 9bf4d036 authored by hjk's avatar hjk
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 2deb7353 edc22700
...@@ -1518,6 +1518,6 @@ ...@@ -1518,6 +1518,6 @@
\o \bold{Open Source front-end for C++ (license MIT)}, enhanced for use in \o \bold{Open Source front-end for C++ (license MIT)}, enhanced for use in
Qt Creator.\br Qt Creator.\br
Roberto Raggi <roberto.raggi@gmail.com>\br Roberto Raggi <roberto.raggi@gmail.com>\br
QtCreator/src/shard/cplusplus QtCreator/src/shared/cplusplus
\endlist \endlist
*/ */
...@@ -26,15 +26,9 @@ SUBDIRS = plugin_coreplugin \ ...@@ -26,15 +26,9 @@ SUBDIRS = plugin_coreplugin \
plugin_qtscripteditor \ plugin_qtscripteditor \
plugin_cpaster \ plugin_cpaster \
plugin_cmakeprojectmanager \ plugin_cmakeprojectmanager \
plugin_fakevim plugin_fakevim \
plugin_designer \
# These two plugins require private headers from Qt and therefore don't work plugin_resourceeditor
# with an installed/released version of Qt.
exists($$(QTDIR)/.qmake.cache) {
SUBDIRS += plugin_designer plugin_resourceeditor
} else {
message(Designer and Resource Editor plugins are not build! They require private headers and do not compile with your released/installed version of Qt)
}
plugin_coreplugin.subdir = coreplugin plugin_coreplugin.subdir = coreplugin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment