diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index 9295fcc3190cb4dbfba65b2ba6d6a162791cf420..d940cd1c65c360b86cb2422c8037281b18f8c66d 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/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();
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index 737b2fc5faacdb07a4dc6f94653b2ba37a38c7a3..be48667591f0afac82357e837f04b45811bc2cf5 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/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;
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 33113f689e94a43710e61dd78a0885fe5a3d117c..68b75b8c8c02b13b7ea3f66e1b1830a84d51c370 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/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",
- "Next Open Document in History"), this);
+ action = new QAction(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",
- "Previous Open Document in History"), this);
+ action = new QAction(this);
Command *ctrlShiftTab = ActionManager::registerAction(action, Core::Constants::GOTONEXTINHISTORY,
modecontext);
windowMenu->addAction(ctrlShiftTab, Core::Constants::G_WINDOW_NAVIGATE);
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index 32d69447af4fd76fefef30678dfcdd704ec754e7..44edcb276bc59ecff7aee4eaf0cdef2815eadac0 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/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."));
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index b8d8adb2f7ba05271f5f06c16d73ab755e24e0ec..ca3ccfa16dc0267ac7cca80bfba86093e2fb3d32 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/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")
- << QLatin1String("darwin") << QLatin1String("bsd4")
- << QLatin1String("bsd") << QLatin1String("unix"));
+ const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
+ if (qt && qt->type() == QLatin1String(IOSQT)) {
+ 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 {
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
index 32bc461c1404de052422ec73d9114671ca9bd7ab..eac59378a0ae55659b8ba340eee9297bc1701566 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
+++ b/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;
diff --git a/src/plugins/qnx/blackberrycertificate.cpp b/src/plugins/qnx/blackberrycertificate.cpp
index b964bd5b146a5ef9fb70a84990eb8a6181a0345e..088a51f408fb550dbb565a74f64a3cc1784eb5f3 100644
--- a/src/plugins/qnx/blackberrycertificate.cpp
+++ b/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()
diff --git a/src/plugins/qnx/blackberrydevicelistdetector.cpp b/src/plugins/qnx/blackberrydevicelistdetector.cpp
index 5598a4150c16ddad3c5490b43f614c8d90b5f085..e3892de75bd449e6763813a707706e313ee46be7 100644
--- a/src/plugins/qnx/blackberrydevicelistdetector.cpp
+++ b/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");
diff --git a/src/plugins/qnx/blackberryndkprocess.cpp b/src/plugins/qnx/blackberryndkprocess.cpp
index d3d9bb32915d58649090a96f6a4e30ef1facebf7..1c3cc9f3c7f44eb3c48df60e33835ab37a46d330 100644
--- a/src/plugins/qnx/blackberryndkprocess.cpp
+++ b/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)),
diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp
index de37a19420ffcecb83ca1b397d3c5fb888e65ca7..c620e334e66ee1a734dcc6fb48c5ceff2aa23f7c 100644
--- a/src/plugins/qnx/blackberryndksettingswidget.cpp
+++ b/src/plugins/qnx/blackberryndksettingswidget.cpp
@@ -124,6 +124,7 @@ void BlackBerryNDKSettingsWidget::launchBlackBerrySetupWizard() const
}
BlackBerrySetupWizard wizard;
+ connect(&wizard, SIGNAL(ndkTargetsUpdated()), this, SLOT(updateNdkList()));
wizard.exec();
}
diff --git a/src/plugins/qnx/blackberrysetupwizard.cpp b/src/plugins/qnx/blackberrysetupwizard.cpp
index 26fd3191ef8afe4354ad754297a49cca6921efc7..6cdbd3e64e60e6061773a40319f9ddf68ae909ee 100644
--- a/src/plugins/qnx/blackberrysetupwizard.cpp
+++ b/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)),
diff --git a/src/plugins/qnx/blackberrysetupwizard.h b/src/plugins/qnx/blackberrysetupwizard.h
index a224ed6487ce3cc0ef76c2a95dd2fd55dc578ef3..a1e39873f5e9fd7200a424b59f2404a71f0c4f39 100644
--- a/src/plugins/qnx/blackberrysetupwizard.h
+++ b/src/plugins/qnx/blackberrysetupwizard.h
@@ -69,6 +69,7 @@ public slots:
signals:
void stepFinished();
+ void ndkTargetsUpdated();
private slots:
void processNextStep();
diff --git a/src/plugins/qnx/blackberrysetupwizardpages.cpp b/src/plugins/qnx/blackberrysetupwizardpages.cpp
index 5d088de19e0bb3d9420f741a9fc23abb59b77c03..fd66057119cdc9b120c7d671884ccb694c1a985c 100644
--- a/src/plugins/qnx/blackberrysetupwizardpages.cpp
+++ b/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);
diff --git a/src/plugins/qnx/blackberrysetupwizardpages.h b/src/plugins/qnx/blackberrysetupwizardpages.h
index ba586a3da4463533cf385a9efc9992ebd7a5b1be..75a00524e1b6793c246b7eba00bec38cb1fd7ea2 100644
--- a/src/plugins/qnx/blackberrysetupwizardpages.h
+++ b/src/plugins/qnx/blackberrysetupwizardpages.h
@@ -70,6 +70,9 @@ public:
bool isComplete() const;
+signals:
+ void targetsUpdated();
+
private:
BlackBerryNDKSettingsWidget *m_widget;
};
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 6372b8cae0904973a6aa7fda20bbb25b39bc5b23..15c46149245c478b82d18580393a8a3db78c6f12 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -121,6 +121,7 @@ RunControl *RemoteLinuxRunControlFactory::create(RunConfiguration *runConfig, Ru
}
QTC_ASSERT(false, return 0);
+ return 0;
}
} // namespace Internal
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 0f41ec72613bd96645cff29f0055fefbce2a6439..cdf1dc90a0dfdd3bb36443e1bf00e05e8bcef914 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/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 +