diff options
Diffstat (limited to 'src')
123 files changed, 1429 insertions, 1351 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 73703551a44..eeb4e56a8b0 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; } diff --git a/src/libs/extensionsystem/extensionsystem_global.h b/src/libs/extensionsystem/extensionsystem_global.h index 2f5f4857adf..9a216178a77 100644 --- a/src/libs/extensionsystem/extensionsystem_global.h +++ b/src/libs/extensionsystem/extensionsystem_global.h @@ -30,6 +30,7 @@ #ifndef EXTENSIONSYSTEM_GLOBAL_H #define EXTENSIONSYSTEM_GLOBAL_H +#include <QLoggingCategory> #include <qglobal.h> #if defined(EXTENSIONSYSTEM_LIBRARY) @@ -38,4 +39,6 @@ # define EXTENSIONSYSTEM_EXPORT Q_DECL_IMPORT #endif +Q_DECLARE_LOGGING_CATEGORY(pluginLog) + #endif // EXTENSIONSYSTEM_GLOBAL_H diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 7477cc3b494..deac311ee3e 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -40,6 +40,7 @@ #include <QDateTime> #include <QDir> #include <QFile> +#include <QLibrary> #include <QMetaProperty> #include <QSettings> #include <QTextStream> @@ -53,6 +54,8 @@ #include <QTest> #endif +Q_LOGGING_CATEGORY(pluginLog, "qtc.extensionsystem") + const char C_IGNORED_PLUGINS[] = "Plugins/Ignored"; const char C_FORCEENABLED_PLUGINS[] = "Plugins/ForceEnabled"; const int DELAYED_INITIALIZE_INTERVAL = 20; // ms @@ -406,25 +409,25 @@ void PluginManager::setPluginPaths(const QStringList &paths) } /*! - The file extension of plugin description files. - The default is "xml". + The IID that valid plugins must have. - \sa setFileExtension() + \sa setPluginIID() */ -QString PluginManager::fileExtension() +QString PluginManager::pluginIID() { - return d->extension; + return d->pluginIID; } /*! - Sets the file extension of plugin description files. - The default is "xml". + Sets the IID that valid plugins must have. Only plugins with this IID are loaded, others are + silently ignored. + At the moment this must be called before setPluginPaths() is called. - // ### TODO let this + setPluginPaths read the plugin specs lazyly whenever loadPlugins() or plugins() is called. + // ### TODO let this + setPluginPaths read the plugin meta data lazyly whenever loadPlugins() or plugins() is called. */ -void PluginManager::setFileExtension(const QString &extension) +void PluginManager::setPluginIID(const QString &iid) { - d->extension = extension; + d->pluginIID = iid; } /*! @@ -892,7 +895,6 @@ void PluginManagerPrivate::nextDelayedInitialize() \internal */ PluginManagerPrivate::PluginManagerPrivate(PluginManager *pluginManager) : - extension(QLatin1String("xml")), delayedInitializeTimer(0), shutdownEventLoop(0), m_profileElapsedMS(0), @@ -1216,6 +1218,8 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt */ void PluginManagerPrivate::setPluginPaths(const QStringList &paths) { + qCDebug(pluginLog) << "Plugin search paths:" << paths; + qCDebug(pluginLog) << "Required IID:" << pluginIID; pluginPaths = paths; readSettings(); readPluginPaths(); @@ -1231,14 +1235,16 @@ void PluginManagerPrivate::readPluginPaths() pluginSpecs.clear(); pluginCategories.clear(); - QStringList specFiles; + QStringList pluginFiles; QStringList searchPaths = pluginPaths; while (!searchPaths.isEmpty()) { const QDir dir(searchPaths.takeFirst()); - const QString pattern = QLatin1String("*.") + extension; - const QFileInfoList files = dir.entryInfoList(QStringList(pattern), QDir::Files); - foreach (const QFileInfo &file, files) - specFiles << file.absoluteFilePath(); + const QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::NoSymLinks); + foreach (const QFileInfo &file, files) { + const QString filePath = file.absoluteFilePath(); + if (QLibrary::isLibrary(filePath)) + pluginFiles.append(filePath); + } const QFileInfoList dirs = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot); foreach (const QFileInfo &subdir, dirs) searchPaths << subdir.absoluteFilePath(); @@ -1246,9 +1252,10 @@ void PluginManagerPrivate::readPluginPaths() defaultCollection = new PluginCollection(QString()); pluginCategories.insert(QString(), defaultCollection); - foreach (const QString &specFile, specFiles) { + foreach (const QString &pluginFile, pluginFiles) { PluginSpec *spec = new PluginSpec; - spec->d->read(specFile); + if (!spec->d->read(pluginFile)) // not a Qt Creator plugin + continue; PluginCollection *collection = 0; // find correct plugin collection or create a new one diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index 31f129980bb..0d45d850d51 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -118,10 +118,10 @@ public: static void loadPlugins(); static QStringList pluginPaths(); static void setPluginPaths(const QStringList &paths); + static QString pluginIID(); + static void setPluginIID(const QString &iid); static QList<PluginSpec *> plugins(); static QHash<QString, PluginCollection *> pluginCollections(); - static void setFileExtension(const QString &extension); - static QString fileExtension(); static bool hasError(); // Settings diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h index b3f845aa66c..b7e22f69867 100644 --- a/src/libs/extensionsystem/pluginmanager_p.h +++ b/src/libs/extensionsystem/pluginmanager_p.h @@ -102,7 +102,7 @@ public: QList<PluginSpec *> pluginSpecs; QList<TestSpec> testSpecs; QStringList pluginPaths; - QString extension; + QString pluginIID; QList<QObject *> allObjects; // ### make this a QList<QPointer<QObject> > > ? QStringList defaultDisabledPlugins; // Plugins/Ignored from install settings QStringList defaultEnabledPlugins; // Plugins/ForceEnabled from install settings diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index af38c01890a..9b0272f081b 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -39,17 +39,20 @@ #include <QDir> #include <QFile> #include <QFileInfo> +#include <QJsonArray> +#include <QJsonDocument> +#include <QJsonObject> +#include <QJsonValue> #include <QPluginLoader> #include <QRegExp> -#include <QXmlStreamReader> /*! \class ExtensionSystem::PluginDependency \brief The PluginDependency class contains the name and required compatible version number of a plugin's dependency. - This reflects the data of a dependency tag in the plugin's XML description - file. The name and version are used to resolve the dependency. That is, + This reflects the data of a dependency object in the plugin's meta data. + The name and version are used to resolve the dependency. That is, a plugin with the given name and plugin \c {compatibility version <= dependency version <= plugin version} is searched for. @@ -86,9 +89,8 @@ /*! \class ExtensionSystem::PluginSpec - \brief The PluginSpec class contains the information of the plugin's XML - description file and - information about the plugin's current state. + \brief The PluginSpec class contains the information of the plugin's embedded meta data + and information about the plugin's current state. The plugin spec is also filled with more information as the plugin goes through its loading process (see PluginSpec::State). @@ -104,9 +106,9 @@ The state gives a hint on what went wrong in case of an error. \value Invalid - Starting point: Even the XML description file was not read. + Starting point: Even the plugin meta data was not read. \value Read - The XML description file has been successfully read, and its + The plugin meta data has been successfully read, and its information is available via the PluginSpec. \value Resolved The dependencies given in the description file have been @@ -448,31 +450,30 @@ QHash<PluginDependency, PluginSpec *> PluginSpec::dependencySpecs() const //==========PluginSpecPrivate================== namespace { - const char PLUGIN[] = "plugin"; - const char PLUGIN_NAME[] = "name"; - const char PLUGIN_VERSION[] = "version"; - const char PLUGIN_COMPATVERSION[] = "compatVersion"; - const char PLUGIN_REQUIRED[] = "required"; - const char PLUGIN_EXPERIMENTAL[] = "experimental"; - const char PLUGIN_DISABLED_BY_DEFAULT[] = "disabledByDefault"; - const char VENDOR[] = "vendor"; - const char COPYRIGHT[] = "copyright"; - const char LICENSE[] = "license"; - const char DESCRIPTION[] = "description"; - const char URL[] = "url"; - const char CATEGORY[] = "category"; - const char PLATFORM[] = "platform"; - const char DEPENDENCYLIST[] = "dependencyList"; - const char DEPENDENCY[] = "dependency"; - const char DEPENDENCY_NAME[] = "name"; - const char DEPENDENCY_VERSION[] = "version"; - const char DEPENDENCY_TYPE[] = "type"; + const char PLUGIN_METADATA[] = "MetaData"; + const char PLUGIN_NAME[] = "Name"; + const char PLUGIN_VERSION[] = "Version"; + const char PLUGIN_COMPATVERSION[] = "CompatVersion"; + const char PLUGIN_REQUIRED[] = "Required"; + const char PLUGIN_EXPERIMENTAL[] = "Experimental"; + const char PLUGIN_DISABLED_BY_DEFAULT[] = "DisabledByDefault"; + const char VENDOR[] = "Vendor"; + const char COPYRIGHT[] = "Copyright"; + const char LICENSE[] = "License"; + const char DESCRIPTION[] = "Description"; + const char URL[] = "Url"; + const char CATEGORY[] = "Category"; + const char PLATFORM[] = "Platform"; + const char DEPENDENCIES[] = "Dependencies"; + const char DEPENDENCY_NAME[] = "Name"; + const char DEPENDENCY_VERSION[] = "Version"; + const char DEPENDENCY_TYPE[] = "Type"; const char DEPENDENCY_TYPE_SOFT[] = "optional"; const char DEPENDENCY_TYPE_HARD[] = "required"; - const char ARGUMENTLIST[] = "argumentList"; - const char ARGUMENT[] = "argument"; - const char ARGUMENT_NAME[] = "name"; - const char ARGUMENT_PARAMETER[] = "parameter"; + const char ARGUMENTS[] = "Arguments"; + const char ARGUMENT_NAME[] = "Name"; + const char ARGUMENT_PARAMETER[] = "Parameter"; + const char ARGUMENT_DESCRIPTION[] = "Description"; } /*! \internal @@ -494,9 +495,11 @@ PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec) /*! \internal + Returns false if the file does not represent a Qt Creator plugin. */ bool PluginSpecPrivate::read(const QString &fileName) { + qCDebug(pluginLog) << "\nReading meta data of" << fileName; name = version = compatVersion @@ -512,30 +515,18 @@ bool PluginSpecPrivate::read(const QString &fileName) hasError = false; errorString.clear(); dependencies.clear(); - QFile file(fileName); - if (!file.open(QIODevice::ReadOnly)) - return reportError(tr("Cannot open file %1 for reading: %2") - .arg(QDir::toNativeSeparators(file.fileName()), file.errorString())); - QFileInfo fileInfo(file); + QFileInfo fileInfo(fileName); location = fileInfo.absolutePath(); filePath = fileInfo.absoluteFilePath(); - QXmlStreamReader reader(&file); - while (!reader.atEnd()) { - reader.readNext(); - switch (reader.tokenType()) { - case QXmlStreamReader::StartElement: - readPluginSpec(reader); - break; - default: - break; - } + loader.setFileName(filePath); + if (loader.fileName().isEmpty()) { + qCDebug(pluginLog) << "Cannot open file"; + return false; } - if (reader.hasError()) - return reportError(tr("Error parsing file %1: %2, at line %3, column %4") - .arg(QDir::toNativeSeparators(file.fileName())) - .arg(reader.errorString()) - .arg(reader.lineNumber()) - .arg(reader.columnNumber())); + + if (!readMetaData(loader.metaData())) + return false; + state = PluginSpec::Read; return true; } @@ -576,238 +567,251 @@ bool PluginSpecPrivate::reportError(const QString &err) { errorString = err; hasError = true; - return false; + return true; } -static inline QString msgAttributeMissing(const char *elt, const char *attribute) +static inline QString msgValueMissing(const char *key) { - return QCoreApplication::translate("PluginSpec", "\"%1\" misses attribute \"%2\"").arg(QLatin1String(elt), QLatin1String(attribute)); + return QCoreApplication::translate("PluginSpec", "\"%1\" is missing").arg(QLatin1String(key)); } -static inline QString msgInvalidFormat(const char *content) +static inline QString msgValueIsNotAString(const char *key) { - return QCoreApplication::translate("PluginSpec", "\"%1\" has invalid format").arg(QLatin1String(content)); + return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not a string") + .arg(QLatin1String(key)); } -static inline QString msgInvalidElement(const QString &name) +static inline QString msgValueIsNotABool(const char *key) { - return QCoreApplication::translate("PluginSpec", "Invalid element \"%1\"").arg(name); + return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not a bool") + .arg(QLatin1String(key)); } -static inline QString msgUnexpectedClosing(const QString &name) +static inline QString msgValueIsNotAObjectArray(const char *key) { - return QCoreApplication::translate("PluginSpec", "Unexpected closing element \"%1\"").arg(name); + return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not an array of objects") + .arg(QLatin1String(key)); } -static inline QString msgUnexpectedToken() +static inline QString msgValueIsNotAMultilineString(const char *key) { - return QCoreApplication::translate("PluginSpec", "Unexpected token"); + return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not a string and not an array of strings") + .arg(QLatin1String(key)); } -/*! - \internal -*/ -void PluginSpecPrivate::readPluginSpec(QXmlStreamReader &reader) +static inline QString msgInvalidFormat(const char *key, const QString &content) { - if (reader.name() != QLatin1String(PLUGIN)) { - reader.raiseError(QCoreApplication::translate("PluginSpec", "Expected element \"%1\" as top level element") - .arg(QLatin1String(PLUGIN))); - return; - } - name = reader.attributes().value(QLatin1String(PLUGIN_NAME)).toString(); - if (name.isEmpty()) { - reader.raiseError(msgAttributeMissing(PLUGIN, PLUGIN_NAME)); - return; - } - version = reader.attributes().value(QLatin1String(PLUGIN_VERSION)).toString(); - if (version.isEmpty()) { - reader.raiseError(msgAttributeMissing(PLUGIN, PLUGIN_VERSION)); - return; - } - if (!isValidVersion(version)) { - reader.raiseError(msgInvalidFormat(PLUGIN_VERSION)); - return; - } - compatVersion = reader.attributes().value(QLatin1String(PLUGIN_COMPATVERSION)).toString(); - if (!compatVersion.isEmpty() && !isValidVersion(compatVersion)) { - reader.raiseError(msgInvalidFormat(PLUGIN_COMPATVERSION)); - return; - } else if (compatVersion.isEmpty()) { - compatVersion = version; - } - required = readBooleanValue(reader, PLUGIN_REQUIRED); - experimental = readBooleanValue(reader, PLUGIN_EXPERIMENTAL); - disabledByDefault = readBooleanValue(reader, PLUGIN_DISABLED_BY_DEFAULT); - if (reader.hasError()) - return; - if (experimental) - disabledByDefault = true; - enabledInSettings = !disabledByDefault; - while (!reader.atEnd()) { - reader.readNext(); - switch (reader.tokenType()) { - case QXmlStreamReader::StartElement: { - const QStringRef element = reader.name(); - if (element == QLatin1String(VENDOR)) - vendor = reader.readElementText().trimmed(); - else if (element == QLatin1String(COPYRIGHT)) - copyright = reader.readElementText().trimmed(); - else if (element == QLatin1String(LICENSE)) - license = reader.readElementText().trimmed(); - else if (element == QLatin1String(DESCRIPTION)) - description = reader.readElementText().trimmed(); - else if (element == QLatin1String(URL)) - url = reader.readElementText().trimmed(); - else if (element == QLatin1String(CATEGORY)) - category = reader.readElementText().trimmed(); - else if (element == QLatin1String(PLATFORM)) { - const QString platformSpec = reader.readElementText().trimmed(); - if (!platformSpec.isEmpty()) { - platformSpecification.setPattern(platformSpec); - if (!platformSpecification.isValid()) - reader.raiseError(QLatin1String("Invalid platform specification \"") - + platformSpec + QLatin1String("\": ") - + platformSpecification.errorString()); - } - } else if (element == QLatin1String(DEPENDENCYLIST)) - readDependencies(reader); - else if (element == QLatin1String(ARGUMENTLIST)) - readArgumentDescriptions(reader); - else - reader.raiseError(msgInvalidElement(element.toString())); - } - break; - case QXmlStreamReader::EndDocument: - case QXmlStreamReader::Comment: - case QXmlStreamReader::EndElement: - case QXmlStreamReader::Characters: - break; - default: - reader.raiseError(msgUnexpectedToken()); - break; - } - } + return QCoreApplication::translate("PluginSpec", "Value \"%2\" for key \"%1\" has invalid format") + .arg(QLatin1String(key), content); } -/*! - \internal -*/ -void PluginSpecPrivate::readArgumentDescriptions(QXmlStreamReader &reader) -{ - while (!reader.atEnd()) { - reader.readNext(); - switch (reader.tokenType()) { - case QXmlStreamReader::StartElement: - if (reader.name() == QLatin1String(ARGUMENT)) - readArgumentDescription(reader); - else - reader.raiseError(msgInvalidElement(reader.name().toString())); - break; - case QXmlStreamReader::Comment: - case QXmlStreamReader::Characters: - break; - case QXmlStreamReader::EndElement: - if (reader.name() == QLatin1String(ARGUMENTLIST)) - return; - reader.raiseError(msgUnexpectedClosing(reader.name().toString())); - break; - default: - reader.raiseError(msgUnexpectedToken()); - break; +static inline bool readMultiLineString(const QJsonValue &value, QString *out) +{ + if (!out) { + qCWarning(pluginLog) << Q_FUNC_INFO << "missing output parameter"; + return false; + } + if (value.isString()) { + *out = value.toString(); + } else if (value.isArray()) { + QJsonArray array = value.toArray(); + QStringList lines; + foreach (const QJsonValue &v, array) { + if (!v.isString()) + return false; + lines.append(v.toString()); } + *out = lines.join(QLatin1Char('\n')); + } else { + return false; } + return true; } /*! \internal */ -void PluginSpecPrivate::readArgumentDescription(QXmlStreamReader &reader) +bool PluginSpecPrivate::readMetaData(const QJsonObject &metaData) { - PluginArgumentDescription arg; - arg.name = reader.attributes().value(QLatin1String(ARGUMENT_NAME)).toString(); - if (arg.name.isEmpty()) { - reader.raiseError(msgAttributeMissing(ARGUMENT, ARGUMENT_NAME)); - return; + qCDebug(pluginLog) << "MetaData:" << QJsonDocument(metaData).toJson(); + QJsonValue value; + value = metaData.value(QLatin1String("IID")); + if (!value.isString()) { + qCDebug(pluginLog) << "Not a plugin (no string IID found)"; + return false; + } + if (value.toString() != PluginManager::pluginIID()) { + qCDebug(pluginLog) << "Plugin ignored (IID does not match)"; + return false; } - arg.parameter = reader.attributes().value(QLatin1String(ARGUMENT_PARAMETER)).toString(); - arg.description = reader.readElementText(); - if (reader.tokenType() != QXmlStreamReader::EndElement) - reader.raiseError(msgUnexpectedToken()); - argumentDescriptions.push_back(arg); -} -bool PluginSpecPrivate::readBooleanValue(QXmlStreamReader &reader, const char *key) -{ - const QStringRef valueString = reader.attributes().value(QLatin1String(key)); - const bool isOn = valueString.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0; - if (!valueString.isEmpty() && !isOn - && valueString.compare(QLatin1String("false"), Qt::CaseInsensitive) != 0) { - reader.raiseError(msgInvalidFormat(key)); + value = metaData.value(QLatin1String(PLUGIN_METADATA)); + if (!value.isObject()) + return reportError(tr("Plugin meta data not found")); + QJsonObject pluginInfo = value.toObject(); + + value = pluginInfo.value(QLatin1String(PLUGIN_NAME)); + if (value.isUndefined()) + return reportError(msgValueMissing(PLUGIN_NAME)); + if (!value.isString()) + return reportError(msgValueIsNotAString(PLUGIN_NAME)); + name = value.toString(); + + value = pluginInfo.value(QLatin1String(PLUGIN_VERSION)); + if (value.isUndefined()) + return reportError(msgValueMissing(PLUGIN_VERSION)); + if (!value.isString()) + return reportError(msgValueIsNotAString(PLUGIN_VERSION)); + version = value.toString(); + if (!isValidVersion(version)) + return reportError(msgInvalidFormat(PLUGIN_VERSION, version)); + + value = pluginInfo.value(QLatin1String(PLUGIN_COMPATVERSION)); + if (!value.isUndefined() && !value.isString()) + return reportError(msgValueIsNotAString(PLUGIN_COMPATVERSION)); + compatVersion = value.toString(version); + if (!value.isUndefined() && !isValidVersion(compatVersion)) + return reportError(msgInvalidFormat(PLUGIN_COMPATVERSION, compatVersion)); + + value = pluginInfo.value(QLatin1String(PLUGIN_REQUIRED)); + if (!value.isUndefined() && !value.isBool()) + return reportError(msgValueIsNotABool(PLUGIN_REQUIRED)); + required = value.toBool(false); + qCDebug(pluginLog) << "required =" << required; + + value = pluginInfo.value(QLatin1String(PLUGIN_EXPERIMENTAL)); + if (!value.isUndefined() && !value.isBool()) + return reportError(msgValueIsNotABool(PLUGIN_EXPERIMENTAL)); + experimental = value.toBool(false); + qCDebug(pluginLog) << "experimental =" << experimental; + + value = pluginInfo.value(QLatin1String(PLUGIN_DISABLED_BY_DEFAULT)); + if (!value.isUndefined() && !value.isBool()) + return reportError(msgValueIsNotABool(PLUGIN_DISABLED_BY_DEFAULT)); + disabledByDefault = value.toBool(false); + qCDebug(pluginLog) << "disabledByDefault =" << disabledByDefault; + + if (experimental) + disabledByDefault = true; + enabledInSettings = !disabledByDefault; + + value = pluginInfo.value(QLatin1String(VENDOR)); + if (!value.isUndefined() && !value.isString()) + return reportError(msgValueIsNotAString(VENDOR)); + vendor = value.toString(); + + value = pluginInfo.value(QLatin1String(COPYRIGHT)); + if (!value.isUndefined() && !value.isString()) + return reportError(msgValueIsNotAString(COPYRIGHT)); + copyright = value.toString(); + + value = pluginInfo.value(QLatin1String(DESCRIPTION)); + if (!value.isUndefined() && !readMultiLineString(value, &description)) + return reportError(msgValueIsNotAString(DESCRIPTION)); + + value = pluginInfo.value(QLatin1String(URL)); + if (!value.isUndefined() && !value.isString()) + return reportError(msgValueIsNotAString(URL)); + url = value.toString(); + + value = pluginInfo.value(QLatin1String(CATEGORY)); + if (!value.isUndefined() && !value.isString()) + return reportError(msgValueIsNotAString(CATEGORY)); + category = value.toString(); + + value = pluginInfo.value(QLatin1String(LICENSE)); + if (!value.isUndefined() && !readMultiLineString(value, &license)) + return reportError(msgValueIsNotAMultilineString(LICENSE)); + + value = pluginInfo.value(QLatin1String(PLATFORM)); + if (!value.isUndefined() && !value.isString()) + return reportError(msgValueIsNotAString(PLATFORM)); + const QString platformSpec = value.toString().trimmed(); + if (!platformSpec.isEmpty()) { + platformSpecification.setPattern(platformSpec); + if (!platformSpecification.isValid()) + return reportError(tr("Invalid platform specification \"%1\": %2") + .arg(platformSpec, platformSpecification.errorString())); } - return isOn; -} -/*! - \internal -*/ -void PluginSpecPrivate::readDependencies(QXmlStreamReader &reader) -{ - while (!reader.atEnd()) { - reader.readNext(); - switch (reader.tokenType()) { - case QXmlStreamReader::StartElement: - if (reader.name() == QLatin1String(DEPENDENCY)) - readDependencyEntry(reader); - else - reader.raiseError(msgInvalidElement(reader.name().toString())); - break; - case QXmlStreamReader::Comment: - case QXmlStreamReader::Characters: - break; - case QXmlStreamReader::EndElement: - if (reader.name() == QLatin1String(DEPENDENCYLIST)) - return; - reader.raiseError(msgUnexpectedClosing(reader.name().toString())); - break; - default: - reader.raiseError(msgUnexpectedToken()); - break; + value = pluginInfo.value(QLatin1String(DEPENDENCIES)); + if (!value.isUndefined() && !value.isArray()) + return reportError(msgValueIsNotAObjectArray(DEPENDENCIES)); + if (!value.isUndefined()) { + QJsonArray array = value.toArray(); + foreach (const QJsonValue &v, array) { + if (!v.isObject()) + return reportError(msgValueIsNotAObjectArray(DEPENDENCIES)); + QJsonObject dependencyObject = v.toObject(); + PluginDependency dep; + value = dependencyObject.value(QLatin1String(DEPENDENCY_NAME)); + if (value.isUndefined()) + return reportError(tr("Dependency: %1").arg(msgValueMissing(DEPENDENCY_NAME))); + if (!value.isString()) + return reportError(tr("Dependency: %1").arg(msgValueIsNotAString(DEPENDENCY_NAME))); + dep.name = value.toString(); + value = dependencyObject.value(QLatin1String(DEPENDENCY_VERSION)); + if (!value.isUndefined() && !value.isString()) + return reportError(tr("Dependency: %1").arg(msgValueIsNotAString(DEPENDENCY_VERSION))); + dep.version = value.toString(); + if (!isValidVersion(dep.version)) + return reportError(tr("Dependency: %1").arg(msgInvalidFormat(DEPENDENCY_VERSION, + dep.version))); + dep.type = PluginDependency::Required; + value = dependencyObject.value(QLatin1String(DEPENDENCY_TYPE)); + if (!value.isUndefined() && !value.isString()) + return reportError(tr("Dependency: %1").arg(msgValueIsNotAString(DEPENDENCY_TYPE))); + if (!value.isUndefined()) { + const QString typeValue = value.toString(); + if (typeValue.toLower() == QLatin1String(DEPENDENCY_TYPE_HARD)) { + dep.type = PluginDependency::Required; + } else if (typeValue.toLower() == QLatin1String(DEPENDENCY_TYPE_SOFT)) { + dep.type = PluginDependency::Optional; + } else { + return reportError(tr("Dependency: \"%1\" must be \"%2\" or \"%3\" (is \"%4\")") + .arg(QLatin1String(DEPENDENCY_TYPE), + QLatin1String(DEPENDENCY_TYPE_HARD), + QLatin1String(DEPENDENCY_TYPE_SOFT), + typeValue)); + } + } + dependencies.append(dep); } } -} -/*! - \internal -*/ -void PluginSpecPrivate::readDependencyEntry(QXmlStreamReader &reader) -{ - PluginDependency dep; - dep.name = reader.attributes().value(QLatin1String(DEPENDENCY_NAME)).toString(); - if (dep.name.isEmpty()) { - reader.raiseError(msgAttributeMissing(DEPENDENCY, DEPENDENCY_NAME)); - return; - } - dep.version = reader.attributes().value(QLatin1String(DEPENDENCY_VERSION)).toString(); - if (!dep.version.isEmpty() && !isValidVersion(dep.version)) { - reader.raiseError(msgInvalidFormat(DEPENDENCY_VERSION)); - return; - } - dep.type = PluginDependency::Required; - if (reader.attributes().hasAttribute(QLatin1String(DEPENDENCY_TYPE))) { - const QStringRef typeValue = reader.attributes().value(QLatin1String(DEPENDENCY_TYPE)); - if (typeValue == QLatin1String(DEPENDENCY_TYPE_HARD)) { - dep.type = PluginDependency::Required; - } else if (typeValue == QLatin1String(DEPENDENCY_TYPE_SOFT)) { - dep.type = PluginDependency::Optional; - } else { - reader.raiseError(msgInvalidFormat(DEPENDENCY_TYPE)); - return; + value = pluginInfo.value(QLatin1String(ARGUMENTS)); + if (!value.isUndefined() && !value.isArray()) + return reportError(msgValueIsNotAObjectArray(ARGUMENTS)); + if (!value.isUndefined()) { + QJsonArray array = value.toArray(); + foreach (const QJsonValue &v, array) { + if (!v.isObject()) + return reportError(msgValueIsNotAObjectArray(ARGUMENTS)); + QJsonObject argumentObject = v.toObject(); + PluginArgumentDescription arg; + value = argumentObject.value(QLatin1String(ARGUMENT_NAME)); + if (value.isUndefined()) + return reportError(tr("Argument: %1").arg(msgValueMissing(ARGUMENT_NAME))); + if (!value.isString()) + return reportError(tr("Argument: %1").arg(msgValueIsNotAString(ARGUMENT_NAME))); + arg.name = value.toString(); + if (arg.name.isEmpty()) + return reportError(tr("Argument: \"%1\" is empty").arg(QLatin1String(ARGUMENT_NAME))); + value = argumentObject.value(QLatin1String(ARGUMENT_DESCRIPTION)); + if (!value.isUndefined() && !value.isString()) + return reportError(tr("Argument: %1").arg(msgValueIsNotAString(ARGUMENT_DESCRIPTION))); + arg.description = value.toString(); + value = argumentObject.value(QLatin1String(ARGUMENT_PARAMETER)); + if (!value.isUndefined() && !value.isString()) + return reportError(tr("Argument: %1").arg(msgValueIsNotAString(ARGUMENT_PARAMETER))); + arg.parameter = value.toString(); + argumentDescriptions.append(arg); + qCDebug(pluginLog) << "Argument:" << arg.name << "Parameter:" << arg.parameter + << "Description:" << arg.description; } } - dependencies.append(dep); - reader.readNext(); - if (reader.tokenType() != QXmlStreamReader::EndElement) - reader.raiseError(msgUnexpectedToken()); + + return true; } /*! @@ -941,32 +945,9 @@ bool PluginSpecPrivate::loadLibrary() hasError = true; return false; } -#ifdef QT_NO_DEBUG - -#ifdef Q_OS_WIN - QString libName = QString::fromLatin1("%1/%2.dll").arg(location).arg(name); -#elif defined(Q_OS_MAC) - QString libName = QString::fromLatin1("%1/lib%2.dylib").arg(location).arg(name); -#else - QString libName = QString::fromLatin1("%1/lib%2.so").arg(location).arg(name); -#endif - -#else //Q_NO_DEBUG - -#ifdef Q_OS_WIN - QString libName = QString::fromLatin1("%1/%2d.dll").arg(location).arg(name); -#elif defined(Q_OS_MAC) - QString libName = QString::fromLatin1("%1/lib%2_debug.dylib").arg(location).arg(name); -#else - QString libName = QString::fromLatin1("%1/lib%2.so").arg(location).arg(name); -#endif - -#endif - - QPluginLoader loader(libName); if (!loader.load()) { hasError = true; - errorString = QDir::toNativeSeparators(libName) + errorString = QDir::toNativeSeparators(filePath) + QString::fromLatin1(": ") + loader.errorString(); return false; } diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h index 6dfac9dbd31..0d8e014e8d4 100644 --- a/src/libs/extensionsystem/pluginspec_p.h +++ b/src/libs/extensionsystem/pluginspec_p.h @@ -33,10 +33,12 @@ #include "pluginspec.h" #include "iplugin.h" +#include <QJsonObject> #include <QObject> +#include <QPluginLoader> +#include <QRegExp> #include <QStringList> #include <QXmlStreamReader> -#include <QRegExp> namespace ExtensionSystem { @@ -62,6 +64,8 @@ public: IPlugin::ShutdownFlag stop(); void kill(); + QPluginLoader loader; + QString name; QString version; QString compatVersion; @@ -98,18 +102,12 @@ public: void disableIndirectlyIfDependencyDisabled(); + bool readMetaData(const QJsonObject &metaData); private: PluginSpec *q; bool reportError(const QString &err); - void readPluginSpec(QXmlStreamReader &reader); - void readDependencies(QXmlStreamReader &reader); - void readDependencyEntry(QXmlStreamReader &reader); - void readArgumentDescriptions(QXmlStreamReader &reader); - void readArgumentDescription(QXmlStreamReader &reader); - bool readBooleanValue(QXmlStreamReader &reader, const char *key); - static QRegExp &versionRegExp(); }; diff --git a/src/plugins/analyzerbase/AnalyzerBase.json.in b/src/plugins/analyzerbase/AnalyzerBase.json.in new file mode 100644 index 00000000000..7b96d9abb9a --- /dev/null +++ b/src/plugins/analyzerbase/AnalyzerBase.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"AnalyzerBase\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Code Analyzer\", + \"Description\" : \"Code Analyzer Base Plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in deleted file mode 100644 index 50588cf90e2..00000000000 --- a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Code Analyzer</category> - <description>Code Analyzer Base Plugin</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/android/Android.json.in b/src/plugins/android/Android.json.in new file mode 100644 index 00000000000..41a92d419dd --- /dev/null +++ b/src/plugins/android/Android.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Android\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"KDE Necessitas\", + \"Copyright\" : \"(C) 2014 BogDan Vatra\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Device Support\", + \"Description\" : \"Support for deployment to and execution on Android Devices.\", + \"Url\" : \"http://necessitas.kde.org\", + $$dependencyList +} diff --git a/src/plugins/android/Android.pluginspec.in b/src/plugins/android/Android.pluginspec.in deleted file mode 100644 index 562a88e53de..00000000000 --- a/src/plugins/android/Android.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Android\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>KDE Necessitas</vendor> - <copyright>(C) 2014 BogDan Vatra</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Support for deployment to and execution on Android Devices</description> - <category>Device Support</category> - <url>http://necessitas.kde.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in new file mode 100644 index 00000000000..7348041c602 --- /dev/null +++ b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"AutotoolsProjectManager\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"DisabledByDefault\" : true, + \"Vendor\" : \"Openismus GmbH\", + \"Copyright\" : \"(C) 2014 Openismus GmbH\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"Autotools project integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in deleted file mode 100644 index 74d504cadd2..00000000000 --- a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"AutotoolsProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"true\"> - <vendor>Openismus GmbH</vendor> - <copyright>(C) 2014 Openismus GmbH</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>Autotools project integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/baremetal/BareMetal.json.in b/src/plugins/baremetal/BareMetal.json.in new file mode 100644 index 00000000000..21e9e7d97a5 --- /dev/null +++ b/src/plugins/baremetal/BareMetal.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"BareMetal\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"Tim Sander\", + \"Copyright\" : \"Copyright (C) 2014 Tim Sander\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Device Support\", + \"Description\" : \"This plugin adds a target for bare metal development.\", + $$dependencyList +} diff --git a/src/plugins/baremetal/BareMetal.pluginspec.in b/src/plugins/baremetal/BareMetal.pluginspec.in deleted file mode 100644 index 3199ed59b4f..00000000000 --- a/src/plugins/baremetal/BareMetal.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"BareMetal\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"true\"> - <vendor>Tim Sander</vendor> - <copyright>Copyright (C) 2014 Tim Sander</copyright> - <license> - Commercial Usage - - Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - - GNU Lesser General Public License Usage - - Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>This plugin adds a target for bare metal development.</description> - <category>Device Support</category> - <url></url> - $$dependencyList -</plugin> diff --git a/src/plugins/bazaar/Bazaar.json.in b/src/plugins/bazaar/Bazaar.json.in new file mode 100644 index 00000000000..128e69d08c7 --- /dev/null +++ b/src/plugins/bazaar/Bazaar.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Bazaar\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Hugues Delorme\", + \"Copyright\" : \"(C) 2014 Hugues Delorme\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"Bazaar integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/bazaar/Bazaar.pluginspec.in b/src/plugins/bazaar/Bazaar.pluginspec.in deleted file mode 100644 index e605a28f365..00000000000 --- a/src/plugins/bazaar/Bazaar.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Bazaar\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Hugues Delorme</vendor> - <copyright>(C) 2014 Hugues Delorme</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>Bazaar integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/beautifier/Beautifier.json.in b/src/plugins/beautifier/Beautifier.json.in new file mode 100644 index 00000000000..66ce2011955 --- /dev/null +++ b/src/plugins/beautifier/Beautifier.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"Beautifier\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"Lorenz Haas\", + \"Copyright\" : \"(C) 2014 Lorenz Haas\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"C++\", + \"Description\" : \"Format source files with the help of beautifiers like AStyle, uncrustify or clang-format.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/beautifier/Beautifier.pluginspec.in b/src/plugins/beautifier/Beautifier.pluginspec.in deleted file mode 100644 index df85d373ebb..00000000000 --- a/src/plugins/beautifier/Beautifier.pluginspec.in +++ /dev/null @@ -1,18 +0,0 @@ -<plugin name=\"Beautifier\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"true\"> - <vendor>Lorenz Haas</vendor> - <copyright>(C) 2014 Lorenz Haas</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Format source files with the help of beautifiers like AStyle, uncrustify or clang-format.</description> - <category>C++</category> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> - diff --git a/src/plugins/bineditor/BinEditor.json.in b/src/plugins/bineditor/BinEditor.json.in new file mode 100644 index 00000000000..d68bc3b6c33 --- /dev/null +++ b/src/plugins/bineditor/BinEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"BinEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Binary editor component.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/bineditor/BinEditor.pluginspec.in b/src/plugins/bineditor/BinEditor.pluginspec.in deleted file mode 100644 index 948268a6a25..00000000000 --- a/src/plugins/bineditor/BinEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"BinEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Binary editor component.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/bookmarks/Bookmarks.json.in b/src/plugins/bookmarks/Bookmarks.json.in new file mode 100644 index 00000000000..3699c1df715 --- /dev/null +++ b/src/plugins/bookmarks/Bookmarks.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Bookmarks\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Bookmarks in text editors.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec.in b/src/plugins/bookmarks/Bookmarks.pluginspec.in deleted file mode 100644 index ad880c8f8d2..00000000000 --- a/src/plugins/bookmarks/Bookmarks.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Bookmarks\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Bookmarks in text editors.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/clangcodemodel/ClangCodeModel.json.in b/src/plugins/clangcodemodel/ClangCodeModel.json.in new file mode 100644 index 00000000000..743e5cecb39 --- /dev/null +++ b/src/plugins/clangcodemodel/ClangCodeModel.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"ClangCodeModel\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"C++\", + \"Description\" : \"Clang Code Model plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in b/src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in deleted file mode 100644 index 43f47e650cc..00000000000 --- a/src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in +++ /dev/null @@ -1,21 +0,0 @@ -<plugin name=\"ClangCodeModel\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"true\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>C++</category> - <description>Clang Code Model plugin.</description> - <url>http://www.qt-project.org</url> - <dependencyList> - <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/> - <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/> - <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/> - </dependencyList> -</plugin> diff --git a/src/plugins/classview/ClassView.json.in b/src/plugins/classview/ClassView.json.in new file mode 100644 index 00000000000..d27b53ec965 --- /dev/null +++ b/src/plugins/classview/ClassView.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"ClassView\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Denis Mingulov\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"C++\", + \"Description\" : \"Class View component.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/classview/ClassView.pluginspec.in b/src/plugins/classview/ClassView.pluginspec.in deleted file mode 100644 index cca6e06aed9..00000000000 --- a/src/plugins/classview/ClassView.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"ClassView\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Denis Mingulov</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>C++</category> - <description>Class View component.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/clearcase/ClearCase.json.in b/src/plugins/clearcase/ClearCase.json.in new file mode 100644 index 00000000000..98a268b72fb --- /dev/null +++ b/src/plugins/clearcase/ClearCase.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"ClearCase\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"DisabledByDefault\" : $$CLEARCASE_DISABLED_STR, + \"Vendor\" : \"AudioCodes\", + \"Copyright\" : \"(C) 2014 AudioCodes Ltd.\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"ClearCase integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/clearcase/ClearCase.pluginspec.in b/src/plugins/clearcase/ClearCase.pluginspec.in deleted file mode 100644 index c9e5e4eacac..00000000000 --- a/src/plugins/clearcase/ClearCase.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"ClearCase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" disabledByDefault=\"$$CLEARCASE_DISABLED_STR\"> - <vendor>AudioCodes</vendor> - <copyright>(C) 2014 AudioCodes Ltd.</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>ClearCase integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index 90810326078..7c8c24a7174 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -5,7 +5,7 @@ import QtcPlugin QtcPlugin { name: "ClearCase" - pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")}) + pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")}) Depends { name: "Qt.widgets" } Depends { name: "Utils" } diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in b/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in new file mode 100644 index 00000000000..72783a55e49 --- /dev/null +++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"CMakeProjectManager\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"CMake support.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in deleted file mode 100644 index aa275ee56f3..00000000000 --- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"CMakeProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>CMake support</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/coreplugin/Core.json.in b/src/plugins/coreplugin/Core.json.in new file mode 100644 index 00000000000..4c0c0e917cb --- /dev/null +++ b/src/plugins/coreplugin/Core.json.in @@ -0,0 +1,31 @@ +{ + \"Name\" : \"Core\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Required\" : true, + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"The core plugin for the Qt IDE.\", + \"Url\" : \"http://www.qt-project.org\", + \"Arguments\" : [ + { + \"Name\" : \"-color\", + \"Parameter\" : \"color\", + \"Description\" : \"Override selected UI color\" + }, + { + \"Name\" : \"-presentationMode\", + \"Description\" : \"Enable presentation mode with pop-ups for key combos\" + } + ], + $$dependencyList +} diff --git a/src/plugins/coreplugin/Core.pluginspec.in b/src/plugins/coreplugin/Core.pluginspec.in deleted file mode 100644 index cb4c7fa9e73..00000000000 --- a/src/plugins/coreplugin/Core.pluginspec.in +++ /dev/null @@ -1,20 +0,0 @@ -<plugin name=\"Core\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" required=\"true\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>The core plugin for the Qt IDE.</description> - <url>http://www.qt-project.org</url> - <argumentList> - <argument name=\"-color\" parameter=\"color\">Override selected UI color</argument> - <argument name=\"-presentationMode\">Enable presentation mode with pop-ups for key combos</argument> - </argumentList> -</plugin> diff --git a/src/plugins/cpaster/CodePaster.json.in b/src/plugins/cpaster/CodePaster.json.in new file mode 100644 index 00000000000..5ad681540ea --- /dev/null +++ b/src/plugins/cpaster/CodePaster.json.in @@ -0,0 +1,18 @@ +{ + \"Name\" : \"CodePaster\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Description\" : \"Codepaster plugin for pushing/fetching diff from server.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/cpaster/CodePaster.pluginspec.in b/src/plugins/cpaster/CodePaster.pluginspec.in deleted file mode 100644 index 5bfb797c902..00000000000 --- a/src/plugins/cpaster/CodePaster.pluginspec.in +++ /dev/null @@ -1,16 +0,0 @@ -<plugin name=\"CodePaster\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Codepaster plugin for pushing/fetching diff from server</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/cppeditor/CppEditor.json.in b/src/plugins/cppeditor/CppEditor.json.in new file mode 100644 index 00000000000..40c64bdf8a8 --- /dev/null +++ b/src/plugins/cppeditor/CppEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"CppEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"C++\", + \"Description\" : \"C/C++ editor component.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/cppeditor/CppEditor.pluginspec.in b/src/plugins/cppeditor/CppEditor.pluginspec.in deleted file mode 100644 index b1ddd79c930..00000000000 --- a/src/plugins/cppeditor/CppEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>C++</category> - <description>C/C++ editor component.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/cpptools/CppTools.json.in b/src/plugins/cpptools/CppTools.json.in new file mode 100644 index 00000000000..fa7e0a28ec3 --- /dev/null +++ b/src/plugins/cpptools/CppTools.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"CppTools\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"C++\", + \"Description\" : \"Tools for analyzing C/C++ code.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/cpptools/CppTools.pluginspec.in b/src/plugins/cpptools/CppTools.pluginspec.in deleted file mode 100644 index 93dac6961fd..00000000000 --- a/src/plugins/cpptools/CppTools.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"CppTools\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>C++</category> - <description>Tools for analyzing C/C++ code.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/cvs/CVS.json.in b/src/plugins/cvs/CVS.json.in new file mode 100644 index 00000000000..519760d87d5 --- /dev/null +++ b/src/plugins/cvs/CVS.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"CVS\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"CVS integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/cvs/CVS.pluginspec.in b/src/plugins/cvs/CVS.pluginspec.in deleted file mode 100644 index 1c89ae0c7c2..00000000000 --- a/src/plugins/cvs/CVS.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"CVS\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>CVS integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/debugger/Debugger.json.in b/src/plugins/debugger/Debugger.json.in new file mode 100644 index 00000000000..68711e45c50 --- /dev/null +++ b/src/plugins/debugger/Debugger.json.in @@ -0,0 +1,44 @@ +{ + \"Name\" : \"Debugger\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Debugger integration.\", + \"Url\" : \"http://www.qt-project.org\", + \"Arguments\" : [ + { + \"Name\" : \"-debug\", + \"Parameter\" : \"pid\", + \"Description\" : \"Attach to local process\" + }, + { + \"Name\" : \"-debug\", + \"Parameter\" : \"executable\", + \"Description\" : \"Start and debug executable\" + }, + { + \"Name\" : \"-debug [executable,]core=<corefile>[,kit=<kit>]\", + \"Description\" : \"Attach to core file\" + }, + { + \"Name\" : \"-debug <executable>,server=<server:port>[,kit=<kit>]\", + \"Description\" : \"Attach to remote debug server\" + }, + { + \"Name\" : \"-wincrashevent\", + \"Parameter\" : \"eventhandle:pid\", + \"Description\" : \"Event handle used for attaching to crashed processes\" + } + ], + $$dependencyList +} diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in deleted file mode 100644 index 6c95aa4ae22..00000000000 --- a/src/plugins/debugger/Debugger.pluginspec.in +++ /dev/null @@ -1,28 +0,0 @@ -<plugin name=\"Debugger\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Debugger integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList - <argumentList> - <argument name=\"-debug\" parameter=\"pid\">Attach to local process</argument> - <argument name=\"-debug\" parameter=\"executable\">Start and debug executable</argument> - <argument name=\"-debug [executable,]core=<corefile>[,kit=<kit>]\"> - Attach to core file</argument> - <argument name=\"-debug <executable>,server=<server:port>[,kit=<kit>]\"> - Attach to remote debug server</argument> - <argument name=\"-wincrashevent\" - parameter=\"eventhandle:pid\"> - Event handle used for attaching to crashed processes</argument> - </argumentList> -</plugin> diff --git a/src/plugins/designer/Designer.json.in b/src/plugins/designer/Designer.json.in new file mode 100644 index 00000000000..c75ef0c5fa3 --- /dev/null +++ b/src/plugins/designer/Designer.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Designer\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Qt Designer integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/designer/Designer.pluginspec.in b/src/plugins/designer/Designer.pluginspec.in deleted file mode 100644 index 1de2d7b4bd5..00000000000 --- a/src/plugins/designer/Designer.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Designer\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Qt Designer integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/diffeditor/DiffEditor.json.in b/src/plugins/diffeditor/DiffEditor.json.in new file mode 100644 index 00000000000..b4db397b77b --- /dev/null +++ b/src/plugins/diffeditor/DiffEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"DiffEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Diff editor component.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/diffeditor/DiffEditor.pluginspec.in b/src/plugins/diffeditor/DiffEditor.pluginspec.in deleted file mode 100644 index de362447dce..00000000000 --- a/src/plugins/diffeditor/DiffEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"DiffEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Diff editor component.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/emacskeys/EmacsKeys.json.in b/src/plugins/emacskeys/EmacsKeys.json.in new file mode 100644 index 00000000000..0fea2fbf916 --- /dev/null +++ b/src/plugins/emacskeys/EmacsKeys.json.in @@ -0,0 +1,31 @@ +{ + \"Name\" : \"EmacsKeys\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"nsf\", + \"Copyright\" : \"(C) nsf <[email protected]>\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Description\" : [ + \"The main idea behind this plugin is to provide additional actions a typical emacs user would expect. It doesn\'t claim to provide full emacs emulation. The following actions are available:\", + \" - Movement [C-f, C-b, C-n, C-p, M-f, M-b, C-a, C-e, M-<, M->]\", + \" - Mark-based selection [C-SPC, C-x C-x]\", + \" - Cut/copy/yank (doesn\'t provide kill ring feature) [M-w, C-w, C-y]\", + \" - Kill actions, which interact properly with clipboard [C-k, M-d, C-d]\", + \" - Scrolling (half of the screen, keeps cursor visible) [C-v, M-v]\", + \" - Insert new line and indent [C-j]\", + \"\", + \"IMPORTANT: Actions are not bound to any key combinations by default. You can find them under \'EmacsKeys\' section in keyboard shortcuts settings.\", + \"\", + \"Also it\'s worth mentioning that EmacsKeys plugin forces disabling of menu mnemonics by calling Qt\'s qt_set_sequence_auto_mnemonic function with false argument. Many of the english menu mnemonics get into the way of typical emacs keys, this includes: Alt+F (File), Alt+B (Build), Alt+W (Window). It\'s a temporary solution, it remains until there is a better one.\" + ], + \"Url\" : \"http://nosmileface.ru\", + $$dependencyList +} diff --git a/src/plugins/emacskeys/EmacsKeys.pluginspec.in b/src/plugins/emacskeys/EmacsKeys.pluginspec.in deleted file mode 100644 index d6020826bb2..00000000000 --- a/src/plugins/emacskeys/EmacsKeys.pluginspec.in +++ /dev/null @@ -1,28 +0,0 @@ -<plugin name=\"EmacsKeys\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"true\"> - <vendor>nsf</vendor> - <copyright>(C) nsf <[email protected]></copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description> -The main idea behind this plugin is to provide additional actions a typical emacs user would expect. It doesn't claim to provide full emacs emulation. The following actions are available: - - Movement [C-f, C-b, C-n, C-p, M-f, M-b, C-a, C-e, M-<, M->] - - Mark-based selection [C-SPC, C-x C-x] - - Cut/copy/yank (doesn't provide kill ring feature) [M-w, C-w, C-y] - - Kill actions, which interact properly with clipboard [C-k, M-d, C-d] - - Scrolling (half of the screen, keeps cursor visible) [C-v, M-v] - - Insert new line and indent [C-j] - -IMPORTANT: Actions are not bound to any key combinations by default. You can find them under 'EmacsKeys' section in keyboard shortcuts settings. - -Also it's worth mentioning that EmacsKeys plugin forces disabling of menu mnemonics by calling Qt's qt_set_sequence_auto_mnemonic function with false argument. Many of the english menu mnemonics get into the way of typical emacs keys, this includes: Alt+F (File), Alt+B (Build), Alt+W (Window). It's a temporary solution, it remains until there is a better one. - </description> - <url>http://nosmileface.ru</url> - $$dependencyList -</plugin> diff --git a/src/plugins/fakevim/FakeVim.json.in b/src/plugins/fakevim/FakeVim.json.in new file mode 100644 index 00000000000..136ea45a038 --- /dev/null +++ b/src/plugins/fakevim/FakeVim.json.in @@ -0,0 +1,18 @@ +{ + \"Name\" : \"FakeVim\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Description\" : \"VI-style keyboard navigation.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/fakevim/FakeVim.pluginspec.in b/src/plugins/fakevim/FakeVim.pluginspec.in deleted file mode 100644 index d8c2b8658da..00000000000 --- a/src/plugins/fakevim/FakeVim.pluginspec.in +++ /dev/null @@ -1,16 +0,0 @@ -<plugin name=\"FakeVim\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>VI-style keyboard navigation.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.json.in b/src/plugins/genericprojectmanager/GenericProjectManager.json.in new file mode 100644 index 00000000000..03fc6696d3f --- /dev/null +++ b/src/plugins/genericprojectmanager/GenericProjectManager.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"GenericProjectManager\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"Generic support.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in deleted file mode 100644 index e018441767e..00000000000 --- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"GenericProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>Generic support</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/git/Git.json.in b/src/plugins/git/Git.json.in new file mode 100644 index 00000000000..f06c501f298 --- /dev/null +++ b/src/plugins/git/Git.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Git\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"Git integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/git/Git.pluginspec.in b/src/plugins/git/Git.pluginspec.in deleted file mode 100644 index 95203b3eb24..00000000000 --- a/src/plugins/git/Git.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Git\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>Git integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/glsleditor/GLSLEditor.json.in b/src/plugins/glsleditor/GLSLEditor.json.in new file mode 100644 index 00000000000..5a8a5b29925 --- /dev/null +++ b/src/plugins/glsleditor/GLSLEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"GLSLEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"GLSL\", + \"Description\" : \"Editor for GLSL.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/glsleditor/GLSLEditor.pluginspec.in b/src/plugins/glsleditor/GLSLEditor.pluginspec.in deleted file mode 100644 index ec077be8b52..00000000000 --- a/src/plugins/glsleditor/GLSLEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"GLSLEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>GLSL</category> - <description>Editor for GLSL.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/helloworld/HelloWorld.json.in b/src/plugins/helloworld/HelloWorld.json.in new file mode 100644 index 00000000000..a276f203e15 --- /dev/null +++ b/src/plugins/helloworld/HelloWorld.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"HelloWorld\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Description\" : \"Hello World sample plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/helloworld/HelloWorld.pluginspec.in b/src/plugins/helloworld/HelloWorld.pluginspec.in deleted file mode 100644 index b99efdddf33..00000000000 --- a/src/plugins/helloworld/HelloWorld.pluginspec.in +++ /dev/null @@ -1,16 +0,0 @@ -<plugin name=\"HelloWorld\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"true\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Hello World sample plugin.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index bb38692de23..062d1fdedbf 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -129,12 +129,12 @@ bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *errorMe } /*! Notification that all extensions that this plugin depends on have been - initialized. The dependencies are defined in the plugins .pluginspec file. + initialized. The dependencies are defined in the plugins .json(.in) file. Normally this function is used for things that rely on other plugins to have added objects to the plugin manager, that implement interfaces that we're interested in. These objects can now be requested through the - PluginManagerInterface. + PluginManager. The HelloWorldPlugin doesn't need things from other plugins, so it does nothing here. diff --git a/src/plugins/help/Help.json.in b/src/plugins/help/Help.json.in new file mode 100644 index 00000000000..54acb9ef227 --- /dev/null +++ b/src/plugins/help/Help.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Help\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Help system.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/help/Help.pluginspec.in b/src/plugins/help/Help.pluginspec.in deleted file mode 100644 index f8bb8ab6f8a..00000000000 --- a/src/plugins/help/Help.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Help\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Help system.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/imageviewer/ImageViewer.json.in b/src/plugins/imageviewer/ImageViewer.json.in new file mode 100644 index 00000000000..60097263a3e --- /dev/null +++ b/src/plugins/imageviewer/ImageViewer.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"ImageViewer\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Image Viewer component.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/imageviewer/ImageViewer.pluginspec.in b/src/plugins/imageviewer/ImageViewer.pluginspec.in deleted file mode 100644 index 6e65a78d7d5..00000000000 --- a/src/plugins/imageviewer/ImageViewer.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"ImageViewer\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Denis Mingulov</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Image Viewer component.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/ios/Ios.json.in b/src/plugins/ios/Ios.json.in new file mode 100644 index 00000000000..766cfda66d4 --- /dev/null +++ b/src/plugins/ios/Ios.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"Ios\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Platform\" : \"OS X.*\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Device Support\", + \"Description\" : \"Support for deployment to and execution on iOS Devices.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/ios/Ios.pluginspec.in b/src/plugins/ios/Ios.pluginspec.in deleted file mode 100644 index 10af513c880..00000000000 --- a/src/plugins/ios/Ios.pluginspec.in +++ /dev/null @@ -1,18 +0,0 @@ -<plugin name=\"Ios\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <platform>OS X.*</platform> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Support for deployment to and execution on iOS Devices</description> - <category>Device Support</category> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/macros/Macros.json.in b/src/plugins/macros/Macros.json.in new file mode 100644 index 00000000000..fc0188fe08a --- /dev/null +++ b/src/plugins/macros/Macros.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Macros\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Macros in text editors.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/macros/Macros.pluginspec.in b/src/plugins/macros/Macros.pluginspec.in deleted file mode 100644 index b88ff2b19b1..00000000000 --- a/src/plugins/macros/Macros.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Macros\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Nicolas Arnaud-Cormos</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Macros in text editors.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/mercurial/Mercurial.json.in b/src/plugins/mercurial/Mercurial.json.in new file mode 100644 index 00000000000..3b42f79e489 --- /dev/null +++ b/src/plugins/mercurial/Mercurial.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Mercurial\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Brian McGillion\", + \"Copyright\" : \"(C) 2014 Brian McGillion\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"Mercurial integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/mercurial/Mercurial.pluginspec.in b/src/plugins/mercurial/Mercurial.pluginspec.in deleted file mode 100644 index 49117607167..00000000000 --- a/src/plugins/mercurial/Mercurial.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Mercurial\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Brian McGillion</vendor> - <copyright>(C) 2014 Brian McGillion</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>Mercurial integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/perforce/Perforce.json.in b/src/plugins/perforce/Perforce.json.in new file mode 100644 index 00000000000..a5d0323cd04 --- /dev/null +++ b/src/plugins/perforce/Perforce.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Perforce\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"Perforce integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/perforce/Perforce.pluginspec.in b/src/plugins/perforce/Perforce.pluginspec.in deleted file mode 100644 index 97037e8fdfa..00000000000 --- a/src/plugins/perforce/Perforce.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Perforce\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>Perforce integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 52d3335a696..92ee74b3fad 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -55,6 +55,7 @@ SUBDIRS = \ qmlprofiler \ welcome + isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ SUBDIRS += \ diff --git a/src/plugins/projectexplorer/ProjectExplorer.json.in b/src/plugins/projectexplorer/ProjectExplorer.json.in new file mode 100644 index 00000000000..33a07e72a98 --- /dev/null +++ b/src/plugins/projectexplorer/ProjectExplorer.json.in @@ -0,0 +1,29 @@ +{ + \"Name\" : \"ProjectExplorer\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"ProjectExplorer framework that can be extended with different kind of project types.\", + \"Url\" : \"http://www.qt-project.org\", + \"Arguments\" : [ + { + \"Name\" : \"-customwizard-verbose\", + \"Description\" : \"Verbose loading of custom wizards\" + }, + { + \"Name\" : \"-lastsession\", + \"Description\" : \"Restore the last session\" + } + ], + $$dependencyList +} diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in deleted file mode 100644 index 62b797fad82..00000000000 --- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in +++ /dev/null @@ -1,21 +0,0 @@ -<plugin name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>ProjectExplorer framework that can be extended with different kind of project types.</description> - <url>http://www.qt-project.org</url> - $$dependencyList - <argumentList> - <argument name=\"-customwizard-verbose\">Verbose loading of custom wizards</argument> - <argument name=\"-lastsession\">Restore the last session</argument> - </argumentList> -</plugin> diff --git a/src/plugins/pythoneditor/PythonEditor.json.in b/src/plugins/pythoneditor/PythonEditor.json.in new file mode 100644 index 00000000000..a573e7cf1e3 --- /dev/null +++ b/src/plugins/pythoneditor/PythonEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"PythonEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Python\", + \"Description\" : \"Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/pythoneditor/PythonEditor.pluginspec.in b/src/plugins/pythoneditor/PythonEditor.pluginspec.in deleted file mode 100644 index fad2ecf5db3..00000000000 --- a/src/plugins/pythoneditor/PythonEditor.pluginspec.in +++ /dev/null @@ -1,18 +0,0 @@ -<plugin name=\"PythonEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Python</category> - <description>Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> - diff --git a/src/plugins/qbsprojectmanager/QbsProjectManager.json.in b/src/plugins/qbsprojectmanager/QbsProjectManager.json.in new file mode 100644 index 00000000000..6c9f72248d6 --- /dev/null +++ b/src/plugins/qbsprojectmanager/QbsProjectManager.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"QbsProjectManager\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"QBS support.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in b/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in deleted file mode 100644 index 89940307613..00000000000 --- a/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QbsProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"true\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>QBS support</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.json.in b/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.json.in new file mode 100644 index 00000000000..9769c4c25ee --- /dev/null +++ b/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QmakeAndroidSupport\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"Android support for qmake project manager.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.pluginspec.in b/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.pluginspec.in deleted file mode 100644 index d77e8fb4b29..00000000000 --- a/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QmakeAndroidSupport\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>Android support for qmake project manager</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in b/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in new file mode 100644 index 00000000000..d3b3fdfc6ad --- /dev/null +++ b/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QmakeProjectManager\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"Provides project type for Qt/QMake .pro files and tools.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in b/src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in deleted file mode 100644 index d334d47fc77..00000000000 --- a/src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QmakeProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>Provides project type for Qt/QMake .pro files and tools.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qmldesigner/QmlDesigner.json.in b/src/plugins/qmldesigner/QmlDesigner.json.in new file mode 100644 index 00000000000..aae85db8518 --- /dev/null +++ b/src/plugins/qmldesigner/QmlDesigner.json.in @@ -0,0 +1,26 @@ +{ + \"Name\" : \"QmlDesigner\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Quick\", + \"Description\" : \"Visual Designer for QML files.\", + \"Url\" : \"http://www.qt-project.org\", + \"Arguments\" : [ + { + \"Name\" : \"-capture-puppet-stream\", + \"Parameter\" : \"capture file\", + \"Description\" : \"Captures the Qml Puppet stream\" + } + ], + $$dependencyList +} diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec.in b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in deleted file mode 100644 index f8fd6670e96..00000000000 --- a/src/plugins/qmldesigner/QmlDesigner.pluginspec.in +++ /dev/null @@ -1,26 +0,0 @@ -<plugin name=\"QmlDesigner\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in -accordance with the Qt Commercial License Agreement provided with the -Software or, alternatively, in accordance with the terms contained in -a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser -General Public License version 2.1 as published by the Free Software -Foundation. Please review the following information to -ensure the GNU Lesser General Public License version 2.1 requirements -will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license> - <category>Qt Quick</category> - <description>Visual Designer for QML files.</description> - <url>http://www.qt-project.org</url> - $$dependencyList - <argumentList> - <argument name=\"-capture-puppet-stream\" parameter=\"capture file\">Captures the Qml Puppet stream</argument> - </argumentList> -</plugin> diff --git a/src/plugins/qmljseditor/QmlJSEditor.json.in b/src/plugins/qmljseditor/QmlJSEditor.json.in new file mode 100644 index 00000000000..a9b74f28d16 --- /dev/null +++ b/src/plugins/qmljseditor/QmlJSEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QmlJSEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Quick\", + \"Description\" : \"Editor for QML and JavaScript.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in deleted file mode 100644 index f0c2b2531e0..00000000000 --- a/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Quick</category> - <description>Editor for QML and JavaScript.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qmljstools/QmlJSTools.json.in b/src/plugins/qmljstools/QmlJSTools.json.in new file mode 100644 index 00000000000..d4e70a43362 --- /dev/null +++ b/src/plugins/qmljstools/QmlJSTools.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QmlJSTools\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Quick\", + \"Description\" : \"Tools for analyzing Qml/JS code.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qmljstools/QmlJSTools.pluginspec.in b/src/plugins/qmljstools/QmlJSTools.pluginspec.in deleted file mode 100644 index d158493627d..00000000000 --- a/src/plugins/qmljstools/QmlJSTools.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Quick</category> - <description>Tools for analyzing Qml/JS code.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qmlprofiler/QmlProfiler.json.in b/src/plugins/qmlprofiler/QmlProfiler.json.in new file mode 100644 index 00000000000..b87f96255fe --- /dev/null +++ b/src/plugins/qmlprofiler/QmlProfiler.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QmlProfiler\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Quick\", + \"Description\" : \"Qml Profiler Plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in deleted file mode 100644 index c1d07a175e0..00000000000 --- a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QmlProfiler\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> - Commercial Usage - - Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - - GNU Lesser General Public License Usage - - Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Quick</category> - <description>Qml Profiler Plugin</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in new file mode 100644 index 00000000000..0a19c8c432d --- /dev/null +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QmlProjectManager\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Quick\", + \"Description\" : \"Qt Quick support\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in deleted file mode 100644 index 8ceeb9e1e31..00000000000 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Quick</category> - <description>Qt Quick support</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qnx/Qnx.json.in b/src/plugins/qnx/Qnx.json.in new file mode 100644 index 00000000000..4bede83a721 --- /dev/null +++ b/src/plugins/qnx/Qnx.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Qnx\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"BlackBerry\", + \"Copyright\" : \"(C) 2014 BlackBerry\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Device Support\", + \"Description\" : \"Adds support for QNX and BlackBerry 10 to Qt Creator.\", + \"Url\" : \"http://www.blackberry.com\", + $$dependencyList +} diff --git a/src/plugins/qnx/Qnx.pluginspec.in b/src/plugins/qnx/Qnx.pluginspec.in deleted file mode 100644 index 30c5ed29aa5..00000000000 --- a/src/plugins/qnx/Qnx.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Qnx\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>BlackBerry</vendor> - <copyright>(C) 2014 BlackBerry</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Adds support for QNX and BlackBerry 10 to Qt Creator</description> - <category>Device Support</category> - <url>http://www.blackberry.com</url> - $$dependencyList -</plugin> diff --git a/src/plugins/qtsupport/QtSupport.json.in b/src/plugins/qtsupport/QtSupport.json.in new file mode 100644 index 00000000000..5e8ead73dc0 --- /dev/null +++ b/src/plugins/qtsupport/QtSupport.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"QtSupport\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Build Systems\", + \"Description\" : \"Provides support code for build systems.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/qtsupport/QtSupport.pluginspec.in b/src/plugins/qtsupport/QtSupport.pluginspec.in deleted file mode 100644 index a71d9728845..00000000000 --- a/src/plugins/qtsupport/QtSupport.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Build Systems</category> - <description>Provides support code for build systems.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/remotelinux/RemoteLinux.json.in b/src/plugins/remotelinux/RemoteLinux.json.in new file mode 100644 index 00000000000..defc2d16636 --- /dev/null +++ b/src/plugins/remotelinux/RemoteLinux.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"RemoteLinux\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Device Support\", + \"Description\" : \"Support for deployment to and execution on a remote Linux host.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/remotelinux/RemoteLinux.pluginspec.in b/src/plugins/remotelinux/RemoteLinux.pluginspec.in deleted file mode 100644 index fcce7867030..00000000000 --- a/src/plugins/remotelinux/RemoteLinux.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Support for deployment to and execution on a remote Linux host.</description> - <category>Device Support</category> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/resourceeditor/ResourceEditor.json.in b/src/plugins/resourceeditor/ResourceEditor.json.in new file mode 100644 index 00000000000..a1b2d91af86 --- /dev/null +++ b/src/plugins/resourceeditor/ResourceEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"ResourceEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Editor for qrc files.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in deleted file mode 100644 index ca458b403e9..00000000000 --- a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"ResourceEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Editor for qrc files.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/subversion/Subversion.json.in b/src/plugins/subversion/Subversion.json.in new file mode 100644 index 00000000000..1b06becc46d --- /dev/null +++ b/src/plugins/subversion/Subversion.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Subversion\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"Subversion integration.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/subversion/Subversion.pluginspec.in b/src/plugins/subversion/Subversion.pluginspec.in deleted file mode 100644 index 3e83d730cbc..00000000000 --- a/src/plugins/subversion/Subversion.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Subversion\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>Subversion integration.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/tasklist/TaskList.json.in b/src/plugins/tasklist/TaskList.json.in new file mode 100644 index 00000000000..a371d422146 --- /dev/null +++ b/src/plugins/tasklist/TaskList.json.in @@ -0,0 +1,18 @@ +{ + \"Name\" : \"TaskList\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Description\" : \"Use .tasks-files to populate the Issues view.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/tasklist/TaskList.pluginspec.in b/src/plugins/tasklist/TaskList.pluginspec.in deleted file mode 100644 index 3ffc8538b94..00000000000 --- a/src/plugins/tasklist/TaskList.pluginspec.in +++ /dev/null @@ -1,16 +0,0 @@ -<plugin name=\"TaskList\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Use .tasks-files to populate the Issues view.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/texteditor/TextEditor.json.in b/src/plugins/texteditor/TextEditor.json.in new file mode 100644 index 00000000000..e4a10fa4ebe --- /dev/null +++ b/src/plugins/texteditor/TextEditor.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"TextEditor\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Text editor framework and the implementation of the basic text editor.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/texteditor/TextEditor.pluginspec.in b/src/plugins/texteditor/TextEditor.pluginspec.in deleted file mode 100644 index 9598315f7b1..00000000000 --- a/src/plugins/texteditor/TextEditor.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Text editor framework and the implementation of the basic text editor.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/todo/Todo.json.in b/src/plugins/todo/Todo.json.in new file mode 100644 index 00000000000..420fcf394b3 --- /dev/null +++ b/src/plugins/todo/Todo.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Todo\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Vendor\" : \"Dmitry Savchenko\", + \"Copyright\" : \"(C) 2014 Dmitry Savchenko, (C) 2014 Vasiliy Sorokin\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Description\" : \"Adds pane that lists all TODO, FIXME, etc. entries in comments.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/todo/Todo.pluginspec.in b/src/plugins/todo/Todo.pluginspec.in deleted file mode 100644 index 32391347d0e..00000000000 --- a/src/plugins/todo/Todo.pluginspec.in +++ /dev/null @@ -1,16 +0,0 @@ -<plugin name=\"Todo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"true\"> - <vendor>Dmitry Savchenko</vendor> - <copyright>(C) 2014 Dmitry Savchenko, (C) 2014 Vasiliy Sorokin</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <description>Adds pane that lists all TODO, FIXME, etc. entries in comments.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/updateinfo/UpdateInfo.json.in b/src/plugins/updateinfo/UpdateInfo.json.in new file mode 100644 index 00000000000..b382c7612b0 --- /dev/null +++ b/src/plugins/updateinfo/UpdateInfo.json.in @@ -0,0 +1,20 @@ +{ + \"Name\" : \"UpdateInfo\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : $$UPDATEINFO_EXPERIMENTAL_STR, + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Displays Update-Infos for Qt Installer Framework-based Updaters.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/updateinfo/UpdateInfo.pluginspec.in b/src/plugins/updateinfo/UpdateInfo.pluginspec.in deleted file mode 100644 index 8e51b9f75fd..00000000000 --- a/src/plugins/updateinfo/UpdateInfo.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"UpdateInfo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"$$UPDATEINFO_EXPERIMENTAL_STR\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Displays Update-Infos for Qt Installer Framework-based Updaters.</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs index 47b26a895e9..6841a0a0e62 100644 --- a/src/plugins/updateinfo/updateinfo.qbs +++ b/src/plugins/updateinfo/updateinfo.qbs @@ -11,7 +11,7 @@ QtcPlugin { Depends { name: "Core" } property bool enable: false - pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")}) + pluginJsonReplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")}) files: [ "updateinfobutton.cpp", diff --git a/src/plugins/valgrind/Valgrind.json.in b/src/plugins/valgrind/Valgrind.json.in new file mode 100644 index 00000000000..875b877ca42 --- /dev/null +++ b/src/plugins/valgrind/Valgrind.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Valgrind\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Code Analyzer\", + \"Description\" : \"Valgrind Plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/valgrind/Valgrind.pluginspec.in b/src/plugins/valgrind/Valgrind.pluginspec.in deleted file mode 100644 index c494295dd65..00000000000 --- a/src/plugins/valgrind/Valgrind.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Valgrind\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Code Analyzer</category> - <description>Valgrind Plugin</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/vcsbase/VcsBase.json.in b/src/plugins/vcsbase/VcsBase.json.in new file mode 100644 index 00000000000..e285302ff45 --- /dev/null +++ b/src/plugins/vcsbase/VcsBase.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"VcsBase\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Version Control\", + \"Description\" : \"Version Control System Base Plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/vcsbase/VcsBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in deleted file mode 100644 index 6c248203076..00000000000 --- a/src/plugins/vcsbase/VcsBase.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Version Control</category> - <description>Version Control System Base Plugin</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/welcome/Welcome.json.in b/src/plugins/welcome/Welcome.json.in new file mode 100644 index 00000000000..ff54d892f34 --- /dev/null +++ b/src/plugins/welcome/Welcome.json.in @@ -0,0 +1,19 @@ +{ + \"Name\" : \"Welcome\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Qt Creator\", + \"Description\" : \"Default Welcome Screen Plugin.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/welcome/Welcome.pluginspec.in b/src/plugins/welcome/Welcome.pluginspec.in deleted file mode 100644 index 062cca73282..00000000000 --- a/src/plugins/welcome/Welcome.pluginspec.in +++ /dev/null @@ -1,17 +0,0 @@ -<plugin name=\"Welcome\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Qt Creator</category> - <description>Default Welcome Screen Plugin</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/plugins/winrt/WinRt.json.in b/src/plugins/winrt/WinRt.json.in new file mode 100644 index 00000000000..4cd8e0afd3c --- /dev/null +++ b/src/plugins/winrt/WinRt.json.in @@ -0,0 +1,21 @@ +{ + \"Name\" : \"WinRt\", + \"Version\" : \"$$QTCREATOR_VERSION\", + \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"Experimental\" : true, + \"Platform\" : \"Windows 8\", + \"Vendor\" : \"Digia Plc\", + \"Copyright\" : \"(C) 2014 Digia Plc\", + \"License\" : [ \"Commercial Usage\", + \"\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"\", + \"GNU Lesser General Public License Usage\", + \"\", + \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + ], + \"Category\" : \"Device Support\", + \"Description\" : \"Helper for Windows Runtime projects.\", + \"Url\" : \"http://www.qt-project.org\", + $$dependencyList +} diff --git a/src/plugins/winrt/WinRt.pluginspec.in b/src/plugins/winrt/WinRt.pluginspec.in deleted file mode 100644 index 447a788ac26..00000000000 --- a/src/plugins/winrt/WinRt.pluginspec.in +++ /dev/null @@ -1,18 +0,0 @@ -<plugin name=\"WinRt\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"true\"> - <platform>Windows 8</platform> - <vendor>Digia Plc</vendor> - <copyright>(C) 2014 Digia Plc</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - </license> - <category>Device Support</category> - <description>Helper for Windows Runtime projects</description> - <url>http://www.qt-project.org</url> - $$dependencyList -</plugin> diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index a1fd8253d93..11916659c6f 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -14,8 +14,8 @@ plugin_recmds = $$QTC_PLUGIN_RECOMMENDS include(../qtcreator.pri) -# for substitution in the .pluginspec -dependencyList = "<dependencyList>" +# for substitution in the .json +dependencyList = for(dep, plugin_deps) { dependencies_file = for(dir, QTC_PLUGIN_DIRS) { @@ -27,7 +27,7 @@ for(dep, plugin_deps) { isEmpty(dependencies_file): \ error("Plugin dependency $$dep not found") include($$dependencies_file) - dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>" + dependencyList += " { \"Name\" : \"$$QTC_PLUGIN_NAME\", \"Version\" : \"$$QTCREATOR_VERSION\" }" } for(dep, plugin_recmds) { dependencies_file = @@ -40,10 +40,11 @@ for(dep, plugin_recmds) { isEmpty(dependencies_file): \ error("Plugin dependency $$dep not found") include($$dependencies_file) - dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>" + dependencyList += " { \"Name\" : \"$$QTC_PLUGIN_NAME\", \"Version\" : \"$$QTCREATOR_VERSION\", \"Type\" : \"optional\" }" } -dependencyList += " </dependencyList>" -dependencyList = $$join(dependencyList, $$escape_expand(\\n)) +dependencyList = $$join(dependencyList, ",$$escape_expand(\\n)") + +dependencyList = "\"Dependencies\" : [$$escape_expand(\\n)$$dependencyList$$escape_expand(\\n) ]" # use gui precompiled header for plugins by default isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h @@ -77,38 +78,16 @@ defineReplace(stripOutDir) { return($$relative_path($$1, $$OUT_PWD)) } -PLUGINSPEC = $$_PRO_FILE_PWD_/$${TARGET}.pluginspec -PLUGINSPEC_IN = $${PLUGINSPEC}.in -exists($$PLUGINSPEC_IN) { - OTHER_FILES += $$PLUGINSPEC_IN - QMAKE_SUBSTITUTES += $$PLUGINSPEC_IN - PLUGINSPEC = $$OUT_PWD/$${TARGET}.pluginspec - copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripOutDir} +PLUGINJSON = $$_PRO_FILE_PWD_/$${TARGET}.json +PLUGINJSON_IN = $${PLUGINJSON}.in +exists($$PLUGINJSON_IN) { + OTHER_FILES += $$PLUGINJSON_IN + QMAKE_SUBSTITUTES += $$PLUGINJSON_IN + PLUGINJSON = $$OUT_PWD/$${TARGET}.json } else { # need to support that for external plugins - OTHER_FILES += $$PLUGINSPEC - copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir} + OTHER_FILES += $$PLUGINJSON } -copy2build.input = PLUGINSPEC -isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS -copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build.name = COPY ${QMAKE_FILE_IN} -copy2build.CONFIG += no_link no_clean -QMAKE_EXTRA_COMPILERS += copy2build - -# Create a Json file containing the plugin information required by -# Qt 5's plugin system by running a XSLT sheet on the -# pluginspec file before moc runs. -XMLPATTERNS = $$targetPath($$[QT_INSTALL_BINS]/xmlpatterns) - -pluginspec2json.name = Create Qt 5 plugin json file -pluginspec2json.input = PLUGINSPEC -pluginspec2json.variable_out = GENERATED_FILES -pluginspec2json.output = $${TARGET}.json -pluginspec2json.commands = $$XMLPATTERNS -no-format -output $$pluginspec2json.output $$PWD/qtcreatorplugin2json.xsl $$PLUGINSPEC -pluginspec2json.CONFIG += no_link -moc_header.depends += $$pluginspec2json.output -QMAKE_EXTRA_COMPILERS += pluginspec2json osx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ include(rpath.pri) @@ -121,9 +100,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF !macx { target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins - pluginspec.files += $${TARGET}.pluginspec - pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins - INSTALLS += target pluginspec + INSTALLS += target } MIMETYPES = $$_PRO_FILE_PWD_/$${TARGET}.mimetypes.xml diff --git a/src/qtcreatorplugin2json.xsl b/src/qtcreatorplugin2json.xsl deleted file mode 100644 index bd85083a009..00000000000 --- a/src/qtcreatorplugin2json.xsl +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0"?> -<!-- XSL sheet to transform Qt Creator's pluginspec files into json files required - for the new Qt 5 plugin system. --> -<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> -<xsl:strip-space elements="plugin vendor category description url"/> -<xsl:template match="/"> -{ - <xsl:apply-templates/> -} -</xsl:template> -<xsl:template match="license"/> -<xsl:template match="dependencyList"/> -<xsl:template match="copyright"/> -<xsl:template match="argumentList"/> -<xsl:template match="vendor"> -"Vendor" : "<xsl:apply-templates/>", -</xsl:template> -<xsl:template match="platform"> -"Platform" : "<xsl:apply-templates/>", -</xsl:template> -<xsl:template match="category"> -"Category" : "<xsl:apply-templates/>", -</xsl:template> -<xsl:template match="description"> -"Description" : "<xsl:apply-templates/>", -</xsl:template> -<xsl:template match="url"> -"Url" : "<xsl:apply-templates/>" -</xsl:template> -</xsl:stylesheet> |