summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-08-26 17:29:38 +0200
committerEike Ziller <eike.ziller@digia.com>2014-09-02 15:11:24 +0200
commitb5b6a46b4e17dde56ac4409bd6551eaaf297b375 (patch)
tree216df467b3df092bad019656329d299b44e51ee1 /src/app
parent8dc9d67e898ecb9afa239fcba914ed178931901b (diff)
downloadqt-creator-b5b6a46b4e17dde56ac4409bd6551eaaf297b375.tar.gz
ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 73703551a4..eeb4e56a8b 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -314,7 +314,7 @@ int main(int argc, char **argv)
#endif
// Manually determine -settingspath command line option
- // We can't use the regular way of the plugin manager, because that needs to parse pluginspecs
+ // We can't use the regular way of the plugin manager, because that needs to parse plugin meta data
// but the settings path can influence which plugins are enabled
QString settingsPath;
QStringList customPluginPaths;
@@ -358,7 +358,7 @@ int main(int argc, char **argv)
QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR),
QLatin1String("QtCreator"));
PluginManager pluginManager;
- PluginManager::setFileExtension(QLatin1String("pluginspec"));
+ PluginManager::setPluginIID(QLatin1String("org.qt-project.Qt.QtCreatorPlugin"));
PluginManager::setGlobalSettings(globalSettings);
PluginManager::setSettings(settings);
@@ -449,7 +449,7 @@ int main(int argc, char **argv)
}
if (!coreplugin) {
QString nativePaths = QDir::toNativeSeparators(pluginPaths.join(QLatin1Char(',')));
- const QString reason = QCoreApplication::translate("Application", "Could not find 'Core.pluginspec' in %1").arg(nativePaths);
+ const QString reason = QCoreApplication::translate("Application", "Could not find Core plugin in %1").arg(nativePaths);
displayError(msgCoreLoadFailure(reason));
return 1;
}