Commit 45f8e241 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.7' into 2.8

Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
parents 116db445 4ae9f377
......@@ -160,7 +160,7 @@ Project {
}
}
ProductModule {
Export {
Depends { name: "cpp" }
cpp.includePaths: product.buildDirectory
}
......
......@@ -18,7 +18,7 @@ DynamicLibrary {
: ["$ORIGIN", "$ORIGIN/.."]
cpp.includePaths: [ ".", ".." ]
ProductModule {
Export {
Depends { name: "cpp" }
cpp.includePaths: [ "." ]
}
......
......@@ -168,7 +168,7 @@ QtcLibrary {
"images/var_prot.png",
]
ProductModule {
Export {
Depends { name: "cpp" }
cpp.includePaths: [
"../3rdparty"
......
......@@ -106,7 +106,7 @@ QtcLibrary {
"iscriptevaluator.h"
]
ProductModule {
Export {
Depends { name: "cpp" }
Depends { name: "LanguageUtils" }
}
......
......@@ -114,7 +114,7 @@ QtcLibrary {
]
}
ProductModule {
Export {
Depends { name: "Qt"; submodules: ["widgets", "network"] }
}
}
......@@ -211,8 +211,8 @@ QtcLibrary {
]
}
ProductModule {
// ### [ remove, once qbs supports merging of ProductModule items in derived products
Export {
// ### [ remove, once qbs supports merging of Export items in derived products
Depends { name: "cpp" }
cpp.includePaths: [ ".." ]
// ### ]
......
......@@ -50,7 +50,7 @@ Product {
qbs.installDir: project.ide_plugin_path + "/" + provider
}
ProductModule {
Export {
Depends { name: "ExtensionSystem" }
}
}
......@@ -44,7 +44,7 @@ QtcPlugin {
"images/analyzer_start_small.png",
]
ProductModule {
Export {
Depends { name: "CPlusPlus" }
}
}
......
......@@ -112,7 +112,8 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
params.solibSearchPath.append(qtSoPaths(version));
}
if (aspect->useQmlDebugger()) {
// FIX ME: Enable Qml Debugging in 2.8
if (aspect->useQmlDebugger() && false) {
params.languages |= QmlLanguage;
QTcpServer server;
QTC_ASSERT(server.listen(QHostAddress::LocalHost)
......
......@@ -254,7 +254,7 @@ QtcPlugin {
]
}
ProductModule {
Export {
Depends { name: "cpp" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
......
......@@ -123,7 +123,7 @@ QtcPlugin {
cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
}
ProductModule {
Export {
Depends { name: "CPlusPlus" }
}
}
......@@ -303,7 +303,7 @@ QtcPlugin {
]
}
ProductModule {
Export {
Depends { name: "cpp" }
Depends { name: "QtcSsh" }
cpp.includePaths: ["."]
......
......@@ -667,7 +667,9 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit, QString *errorM
IDevice::ConstPtr device = DeviceKitInformation::device(kit);
if (device) {
sp->connParams = device->sshParameters();
sp->remoteChannel = sp->connParams.host + QLatin1Char(':') + QString::number(sp->connParams.port);
// Could have been set from command line.
if (sp->remoteChannel.isEmpty())
sp->remoteChannel = sp->connParams.host + QLatin1Char(':') + QString::number(sp->connParams.port);
}
return true;
}
......
......@@ -444,8 +444,8 @@ static bool fixupEngineTypes(DebuggerStartParameters &sp, RunConfiguration *rc,
if (const Target *target = rc->target())
if (!fillParameters(&sp, target->kit(), errorMessage))
return false;
const bool useCppDebugger = aspect->useCppDebugger();
const bool useQmlDebugger = aspect->useQmlDebugger();
const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage);
const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage);
if (useQmlDebugger) {
if (useCppDebugger) {
sp.masterEngineType = QmlCppEngineType;
......
......@@ -289,6 +289,7 @@ int AttachCoreDialog::exec()
{
connect(d->selectRemoteCoreButton, SIGNAL(clicked()), SLOT(selectRemoteCoreFile()));
connect(d->remoteCoreFileName, SIGNAL(textChanged(QString)), SLOT(changed()));
connect(d->localExecFileName, SIGNAL(changed(QString)), SLOT(changed()));
connect(d->localCoreFileName, SIGNAL(changed(QString)), SLOT(changed()));
connect(d->forceLocalCheckBox, SIGNAL(stateChanged(int)), SLOT(changed()));
connect(d->kitChooser, SIGNAL(activated(int)), SLOT(changed()));
......
......@@ -354,7 +354,7 @@ QtcPlugin {
files: ["outputparser_test.h", "outputparser_test.cpp"]
}
ProductModule {
Export {
Depends { name: "Qt.network" }
}
}
......@@ -793,7 +793,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
return false;
}
if (!warnings.isEmpty() && differenceHandler.isValidator()) {
if (!warnings.isEmpty() && differenceHandler.isValidator() && !m_rewriterView->inErrorState()) {
QString title = QCoreApplication::translate("QmlDesigner::TextToModelMerger", "This .qml file contains features "
"which are not supported by Qt Quick Designer");
......
......@@ -85,7 +85,7 @@ QtcPlugin {
"images/qmlfile.png",
]
ProductModule {
Export {
Depends { name: "QmlJSTools" }
}
}
......@@ -78,7 +78,7 @@ QtcPlugin {
files: ["qmljstools_test.cpp"]
}
ProductModule {
Export {
Depends { name: "CppTools" }
Depends { name: "QmlDebug" }
}
......
......@@ -109,8 +109,7 @@ QtcPlugin {
"QtSupport.mimetypes.xml",
]
ProductModule {
Export {
Depends { name: "cpp" }
cpp.includePaths: "../../shared"
cpp.defines: [
......
......@@ -113,7 +113,7 @@ QtcPlugin {
"images/embeddedtarget.png",
]
ProductModule {
Export {
Depends { name: "Core" }
Depends { name: "QtcSsh" }
}
......
......@@ -268,7 +268,7 @@ QtcPlugin {
]
}
ProductModule {
Export {
Depends { name: "Find" }
Depends { name: "Locator" }
}
......
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