Merge remote-tracking branch 'origin/3.0'

src/libs/qmljs/qmljsreformatter.cpp

@@ -139,11 +139,6 @@ protected:
         Node::accept(node, this);
     }
 
-    void acceptIndented(Node *node)
-    {
-        accept(node);
-    }
-
     void lnAcceptIndented(Node *node)
     {
         newLine();

src/plugins/coreplugin/editormanager/documentmodel.cpp

@@ -29,6 +29,7 @@
 
 #include "documentmodel.h"
 #include "ieditor.h"
+#include <coreplugin/documentmanager.h>
 #include <coreplugin/idocument.h>
 
 #include <utils/qtcassert.h>
@@ -194,8 +195,9 @@ int DocumentModel::indexOfFilePath(const QString &filePath) const
 {
     if (filePath.isEmpty())
         return -1;
+    const QString fixedPath = DocumentManager::fixFileName(filePath, DocumentManager::KeepLinks);
     for (int i = 0; i < d->m_documents.count(); ++i) {
-        if (d->m_documents.at(i)->fileName() == filePath)
+        if (DocumentManager::fixFileName(d->m_documents.at(i)->fileName(), DocumentManager::KeepLinks) == fixedPath)
             return i;
     }
     return -1;

src/plugins/help/helpplugin.cpp

@@ -302,8 +302,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     if (ActionContainer *windowMenu = ActionManager::actionContainer(Core::Constants::M_WINDOW)) {
         // reuse EditorManager constants to avoid a second pair of menu actions
         // Goto Previous In History Action
-        action = new QAction(QApplication::translate("EditorManager",
+        action = new QAction(this);
-            "Next Open Document in History"), this);
         Command *ctrlTab = ActionManager::registerAction(action, Core::Constants::GOTOPREVINHISTORY,
             modecontext);
         windowMenu->addAction(ctrlTab, Core::Constants::G_WINDOW_NAVIGATE);
@@ -311,8 +310,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
             SLOT(gotoPreviousPage()));
 
         // Goto Next In History Action
-        action = new QAction(QApplication::translate("EditorManager",
+        action = new QAction(this);
-            "Previous Open Document in History"), this);
         Command *ctrlShiftTab = ActionManager::registerAction(action, Core::Constants::GOTONEXTINHISTORY,
             modecontext);
         windowMenu->addAction(ctrlShiftTab, Core::Constants::G_WINDOW_NAVIGATE);

src/plugins/ios/iosdebugsupport.cpp

@@ -162,7 +162,9 @@ void IosDebugSupport::handleGotInferiorPid(Q_PID pid)
 {
     if (pid > 0) {
         //m_runControl->engine()->notifyInferiorPid(pid);
+#ifndef Q_OS_WIN // Q_PID might be 64 bit pointer...
         m_runControl->engine()->notifyEngineRemoteSetupDone(int(pid), m_qmlPort);
+#endif
     } else {
         m_runControl->engine()->notifyEngineRemoteSetupFailed(
                     tr("Got an invalid process id."));

src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp

@@ -95,9 +95,19 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
                                    ? QStringList() << QLatin1String("mingw") << QLatin1String("gcc")
                                    : QStringList() << QLatin1String("msvc"));
         } else if (targetAbi.os() == ProjectExplorer::Abi::MacOS) {
-            data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("osx")
+            const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
-                        << QLatin1String("darwin") << QLatin1String("bsd4")
+            if (qt && qt->type() == QLatin1String(IOSQT)) {
-                        << QLatin1String("bsd") << QLatin1String("unix"));
+                QStringList targetOS;
+                if (targetAbi.architecture() == ProjectExplorer::Abi::X86Architecture)
+                    targetOS << QLatin1String("ios-simulator");
+                targetOS << QLatin1String("ios") << QLatin1String("darwin")
+                         << QLatin1String("bsd4") << QLatin1String("bsd") << QLatin1String("unix");
+                data.insert(QLatin1String(QBS_TARGETOS), targetOS);
+            } else {
+                data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("osx")
+                            << QLatin1String("darwin") << QLatin1String("bsd4")
+                            << QLatin1String("bsd") << QLatin1String("unix"));
+            }
             if (tc->type() != QLatin1String("clang")) {
                 data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
             } else {

src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp

@@ -118,7 +118,7 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const QString &fileName,
                 setupFileFilterItem(cssFileFilterItem, childNode);
                 projectItem->appendContent(cssFileFilterItem);
             } else {
-                qWarning() << "Unkwown type:" << childNode->name();
+                qWarning() << "Unknown type:" << childNode->name();
             }
         }
         return projectItem;

src/plugins/qnx/blackberrycertificate.cpp

@@ -34,6 +34,7 @@
 #include "blackberryconfigurationmanager.h"
 #include "blackberryndkprocess.h"
 
+#include <utils/environment.h>
 #include <utils/hostosinfo.h>
 
 #include <QProcess>
@@ -52,6 +53,8 @@ BlackBerryCertificate::BlackBerryCertificate(const QString &fileName,
     m_process(new QProcess(this))
 {
     m_process->setProcessChannelMode(QProcess::MergedChannels);
+    m_process->setEnvironment(Utils::EnvironmentItem::toStringList(
+             BlackBerryConfigurationManager::instance().defaultQnxEnv()));
 }
 
 void BlackBerryCertificate::load()

src/plugins/qnx/blackberrydevicelistdetector.cpp

@@ -30,8 +30,11 @@
 
 #include "blackberrydevicelistdetector.h"
 
+#include "blackberryconfigurationmanager.h"
 #include "blackberryndkprocess.h"
 
+#include <utils/environment.h>
+
 #include <QStringList>
 
 namespace Qnx {
@@ -53,6 +56,8 @@ void BlackBerryDeviceListDetector::detectDeviceList()
     if (m_process->state() != QProcess::NotRunning)
         return;
 
+    m_process->setEnvironment(Utils::EnvironmentItem::toStringList(
+             BlackBerryConfigurationManager::instance().defaultQnxEnv()));
     const QString command = BlackBerryNdkProcess::resolveNdkToolPath(QLatin1String("blackberry-deploy"));
     QStringList arguments;
     arguments << QLatin1String("-devices");

src/plugins/qnx/blackberryndkprocess.cpp

@@ -46,6 +46,8 @@ BlackBerryNdkProcess::BlackBerryNdkProcess(const QString &command, QObject *pare
     m_command(command)
 {
     m_process->setProcessChannelMode(QProcess::MergedChannels);
+    m_process->setEnvironment(Utils::EnvironmentItem::toStringList(
+             BlackBerryConfigurationManager::instance().defaultQnxEnv()));
 
     connect(m_process, SIGNAL(started()), this, SIGNAL(started()));
     connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)),

src/plugins/qnx/blackberryndksettingswidget.cpp

@@ -124,6 +124,7 @@ void BlackBerryNDKSettingsWidget::launchBlackBerrySetupWizard() const
     }
 
     BlackBerrySetupWizard wizard;
+    connect(&wizard, SIGNAL(ndkTargetsUpdated()), this, SLOT(updateNdkList()));
     wizard.exec();
 }
 

src/plugins/qnx/blackberrysetupwizard.cpp

@@ -93,6 +93,8 @@ BlackBerrySetupWizard::BlackBerrySetupWizard(QWidget *parent) :
     m_uploader = new BlackBerryDebugTokenUploader(this);
     m_keyGenerator = new QSsh::SshKeyGenerator;
 
+    connect(m_ndkPage, SIGNAL(targetsUpdated()),
+            this, SIGNAL(ndkTargetsUpdated()));
     connect(m_deviceInfo, SIGNAL(finished(int)),
             this, SLOT(deviceInfoFinished(int)));
     connect(m_requester, SIGNAL(finished(int)),

src/plugins/qnx/blackberrysetupwizard.h

@@ -69,6 +69,7 @@ public slots:
 
 signals:
     void stepFinished();
+    void ndkTargetsUpdated();
 
 private slots:
     void processNextStep();

src/plugins/qnx/blackberrysetupwizardpages.cpp

@@ -87,6 +87,7 @@ BlackBerrySetupWizardNdkPage::BlackBerrySetupWizardNdkPage(QWidget *parent) :
     m_widget->setWizardMessageVisible(false);
 
     connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(completeChanged()));
+    connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(targetsUpdated()));
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(m_widget);

src/plugins/qnx/blackberrysetupwizardpages.h

@@ -70,6 +70,9 @@ public:
 
     bool isComplete() const;
 
+signals:
+    void targetsUpdated();
+
 private:
     BlackBerryNDKSettingsWidget *m_widget;
 };

src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp

@@ -121,6 +121,7 @@ RunControl *RemoteLinuxRunControlFactory::create(RunConfiguration *runConfig, Ru
     }
 
     QTC_ASSERT(false, return 0);
+    return 0;
 }
 
 } // namespace Internal

tests/auto/debugger/tst_dumpers.cpp

@@ -857,7 +857,7 @@ void tst_Dumpers::dumper()
             "\n#endif"
             "\n" + (data.useQHash ?
                 "\n#if QT_VERSION >= 0x050000"
-                "\nqt_qhash_seed.testAndSetRelaxed(-1, 0);"
+                "\nqt_qhash_seed.store(0);"
                 "\n#endif\n" : "") +
             "\n    unused(&argc, &argv, &qtversion, &gccversion);\n"
             "\n" + data.code +