Commit 3b67e5dd authored by Leandro Melo's avatar Leandro Melo
Browse files

Merge remote-tracking branch 'origin/2.4'

Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I516c496175afe94c57b8a1dd978d9c5cccc44610
parents 34ed3f29 d5b65513
......@@ -16,7 +16,7 @@ PageStackWindow {
ToolIcon {
platformIconId: "toolbar-view-menu"
anchors.right: (parent === undefined) ? undefined : parent.right
onClicked: (myMenu.status == DialogStatus.Closed) ? myMenu.open() : myMenu.close()
onClicked: (myMenu.status === DialogStatus.Closed) ? myMenu.open() : myMenu.close()
}
}
......
......@@ -1544,7 +1544,6 @@ void CdbEngine::selectThread(int index)
if (index < 0 || index == threadsHandler()->currentThread())
return;
resetLocation();
const int newThreadId = threadsHandler()->threads().at(index).id;
threadsHandler()->setCurrentThread(index);
......
......@@ -404,11 +404,11 @@ Utils::FileName GccToolChain::mkspec() const
if (abi.os() == Abi::MacOS) {
QString v = version();
// prefer versioned g++ on mac. This is required to enable building for older Mac OS versions
if (v.startsWith(QLatin1String("4.0")))
return Utils::FileName::fromString("macx-g++40");
if (v.startsWith(QLatin1String("4.2")))
return Utils::FileName::fromString("macx-g++42");
return Utils::FileName::fromString("macx-g++");
if (v.startsWith(QLatin1String("4.0")) && m_compilerPath.endsWith(QLatin1String("-4.0")))
return Utils::FileName::fromString(QLatin1String("macx-g++40"));
if (v.startsWith(QLatin1String("4.2")) && m_compilerPath.endsWith(QLatin1String("-4.2")))
return Utils::FileName::fromString(QLatin1String("macx-g++42"));
return Utils::FileName::fromString(QLatin1String("macx-g++"));
}
QList<Abi> gccAbiList = Abi::abisOfBinary(m_compilerPath);
......
......@@ -471,24 +471,6 @@ Utils::FileName BaseQtVersion::sourcePath() const
return m_sourcePath;
}
// Return a list of GUI binary names
// 'foo', 'foo.exe', 'Foo.app/Contents/MacOS/Foo'
static inline QStringList possibleGuiBinaries(const QString &name)
{
#ifdef Q_OS_WIN
return QStringList(name + QLatin1String(".exe"));
#elif defined(Q_OS_MAC) // 'Foo.app/Contents/MacOS/Foo'
QString upCaseName = name;
upCaseName[0] = upCaseName.at(0).toUpper();
QString macBinary = upCaseName;
macBinary += QLatin1String(".app/Contents/MacOS/");
macBinary += upCaseName;
return QStringList(macBinary);
#else
return QStringList(name);
#endif
}
QString BaseQtVersion::designerCommand() const
{
if (!isValid())
......@@ -550,7 +532,13 @@ QString BaseQtVersion::findQtBinary(Binaries binary) const
switch (binary) {
case QmlViewer: {
if (qtVersion() < QtVersionNumber(5, 0, 0)) {
possibleCommands << possibleGuiBinaries(QLatin1String("qmlviewer"));
#if defined(Q_OS_WIN)
possibleCommands << QLatin1String("qmlviewer.exe");
#elif defined(Q_OS_MAC)
possibleCommands << QLatin1String("QMLViewer.app/Contents/MacOS/QMLViewer");
#else
possibleCommands << QLatin1String("qmlviewer");
#endif
} else {
#if defined(Q_OS_WIN)
possibleCommands << QLatin1String("qmlscene.exe");
......@@ -561,10 +549,22 @@ QString BaseQtVersion::findQtBinary(Binaries binary) const
}
break;
case Designer:
possibleCommands << possibleGuiBinaries(QLatin1String("designer"));
#if defined(Q_OS_WIN)
possibleCommands << QLatin1String("designer.exe");
#elif defined(Q_OS_MAC)
possibleCommands << QLatin1String("Designer.app/Contents/MacOS/Designer");
#else
possibleCommands << QLatin1String("designer");
#endif
break;
case Linguist:
possibleCommands << possibleGuiBinaries(QLatin1String("linguist"));
#if defined(Q_OS_WIN)
possibleCommands << QLatin1String("linguist.exe");
#elif defined(Q_OS_MAC)
possibleCommands << QLatin1String("Linguist.app/Contents/MacOS/Linguist");
#else
possibleCommands << QLatin1String("linguist");
#endif
break;
case Uic:
#ifdef Q_OS_WIN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment