diff options
Diffstat (limited to 'src/plugins/qt4projectmanager')
| -rw-r--r-- | src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 30 |
2 files changed, 6 insertions, 26 deletions
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 7aa32cae75..de1e02f77d 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -421,7 +421,7 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay() "<ul><li>1 - Build Issues</li><li>2 - Search Results</li><li>3 - Application Output</li>" "<li>4 - Compile Output</li></ul>").arg(altShortcut)); tips.append(tr("You can quickly search methods, classes, help and more using the " - "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-navigation.html\">Locator bar</a> (<tt>%1+K</tt>).").arg(ctrlShortcut)); + "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html\">Locator bar</a> (<tt>%1+K</tt>).").arg(ctrlShortcut)); tips.append(tr("You can add custom build steps in the " "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-build-settings.html\">build settings</a>.")); tips.append(tr("Within a session, you can add " diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 06b9d18ecd..71b67ea2e9 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1451,35 +1451,15 @@ void QtVersion::updateToolChainAndMkspec() const else if (value == "build_all") m_defaultConfigIsDebugAndRelease = true; } + // Is this actually a simulator Qt? + if (configValues.contains(QLatin1String("simulator"))) { + m_targetIds.clear(); + m_targetIds.insert(QLatin1String(Constants::QT_SIMULATOR_TARGET_ID)); + } delete reader; ProFileCacheManager::instance()->decRefCount(); m_toolChainUpToDate = true; - - // Check qconfig.h for QT_SIMULATOR define on desktop builds and switch the - // Qt version to Qt simulator target: - if (m_targetIds.contains(Constants::DESKTOP_TARGET_ID)) { - QString path(headerInstallPath()); - path.append(QLatin1String("/Qt/qconfig.h")); - QFile qconfig(path); - if (!qconfig.exists()) - return; - qconfig.open(QIODevice::ReadOnly); - QTextStream stream(&qconfig); - QString line; - bool isSimulator = false; - while (!(line = stream.readLine()).isNull()) { - if (line.startsWith(QLatin1String("#define QT_SIMULATOR"))) { - isSimulator = true; - break; - } - } - qconfig.close(); - if (isSimulator) { - m_targetIds.remove(QLatin1String(Constants::DESKTOP_TARGET_ID)); - m_targetIds.insert(QLatin1String(Constants::QT_SIMULATOR_TARGET_ID)); - } - } } QString QtVersion::mwcDirectory() const |