diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 26c43e7c92af9704d476bfff9d5124534268b4c1..c19c0fea7c855b29965f0c0d58de52163d85b0cb 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -1518,6 +1518,6 @@ \o \bold{Open Source front-end for C++ (license MIT)}, enhanced for use in Qt Creator.\br Roberto Raggi <roberto.raggi@gmail.com>\br - QtCreator/src/shard/cplusplus + QtCreator/src/shared/cplusplus \endlist */ diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index bd7cbece15d3282a9c1bd606327d770ee0f88b78..dcd7b09bf7a0e0172c82966d93f9db2682d69441 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -26,15 +26,9 @@ SUBDIRS = plugin_coreplugin \ plugin_qtscripteditor \ plugin_cpaster \ plugin_cmakeprojectmanager \ - plugin_fakevim - -# These two plugins require private headers from Qt and therefore don't work -# 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_fakevim \ + plugin_designer \ + plugin_resourceeditor plugin_coreplugin.subdir = coreplugin