feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PluginSpec platforms: It is "OS X"

Browse Source 
Change-Id: Ibb3c2be1401b3c09d38f0fd689658b409ff52f7b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Eike Ziller
2014-07-11 11:21:31 +02:00
parent a9619af26c
commit 20c4a9f262
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -1377,10 +1377,13 @@ void PluginManagerPrivate::profilingSummary() const
static inline QString getPlatformName() static inline QString getPlatformName()
{ {
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
QString result = QLatin1String("Mac OS"); if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_0) {
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_0) QString result = QLatin1String("OS X");
result += QLatin1String(" 10.") + QString::number(QSysInfo::MacintoshVersion - QSysInfo::MV_10_0); result += QLatin1String(" 10.") + QString::number(QSysInfo::MacintoshVersion - QSysInfo::MV_10_0);
return result; return result;
} else {
return QLatin1String("Mac OS");
}
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
QString base; QString base;
# ifdef Q_OS_LINUX # ifdef Q_OS_LINUX

2
src/plugins/ios/Ios.pluginspec.in
View File

@@ -1,7 +1,7 @@
<plugin name=\"Ios\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\"> <plugin name=\"Ios\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
<vendor>Digia Plc</vendor> <vendor>Digia Plc</vendor>
<copyright>(C) 2014 Digia Plc</copyright> <copyright>(C) 2014 Digia Plc</copyright>
<platform>Mac OS.*</platform> <platform>OS X.*</platform>
<license> <license>
Commercial Usage Commercial Usage