Merge remote-tracking branch 'origin/2.8'

This commit is contained in:
Eike Ziller
2013-05-28 18:30:11 +02:00
118 changed files with 5040 additions and 2360 deletions

View File

@@ -29,8 +29,11 @@
#include "icore.h"
#include <app/app_version.h>
#include <extensionsystem/pluginmanager.h>
#include <QSysInfo>
/*!
\namespace Core
\brief The Core namespace contains all classes that make up the Core plugin
@@ -501,6 +504,41 @@ QString ICore::userResourcePath()
return urp;
}
static QString compilerString()
{
#if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too
QString isAppleString;
#if defined(__apple_build_version__) // Apple clang has other version numbers
isAppleString = QLatin1String(" (Apple)");
#endif
return QLatin1String("Clang " ) + QString::number(__clang_major__) + QLatin1Char('.')
+ QString::number(__clang_minor__) + isAppleString;
#elif defined(Q_CC_GNU)
return QLatin1String("GCC " ) + QLatin1String(__VERSION__);
#elif defined(Q_CC_MSVC)
if (_MSC_VER >= 1500) // 1500: MSVC 2008, 1600: MSVC 2010, ...
return QLatin1String("MSVC ") + QString::number(2008 + 2 * ((_MSC_VER / 100) - 15));
#endif
return QLatin1String("<unknown compiler>");
}
QString ICore::versionString()
{
QString ideVersionDescription;
#ifdef IDE_VERSION_DESCRIPTION
ideVersionDescription = tr(" (%1)").arg(QLatin1String(Constants::IDE_VERSION_DESCRIPTION_STR));
#endif
return tr("Qt Creator %1%2").arg(QLatin1String(Constants::IDE_VERSION_LONG),
ideVersionDescription);
}
QString ICore::buildCompatibilityString()
{
return tr("Based on Qt %1 (%2, %3 bit)").arg(QLatin1String(qVersion()),
compilerString(),
QString::number(QSysInfo::WordSize));
}
IContext *ICore::currentContextObject()
{
return m_mainwindow->currentContextObject();