diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-05-27 17:17:40 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-27 17:17:40 +0200 |
commit | 45f8e241ba24ba663a22d0c6a8c7b201f37e7c8f (patch) | |
tree | 13e18102fecaf3a797053a571a9a0f05dbf2f5a6 | |
parent | 116db445bf9f0175acdc7217ea603a3521bd635d (diff) | |
parent | 4ae9f3778f9e1f7847783ffd7a1b779dd71d093d (diff) |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/android/androiddebugsupport.cpp
src/plugins/qtsupport/qtsupport.qbs
Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
22 files changed, 27 insertions, 24 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 96216f14797..e773619b38d 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -160,7 +160,7 @@ Project { } } - ProductModule { + Export { Depends { name: "cpp" } cpp.includePaths: product.buildDirectory } diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs index 85e27024df2..44a6641cb85 100644 --- a/src/libs/QtcLibrary.qbs +++ b/src/libs/QtcLibrary.qbs @@ -18,7 +18,7 @@ DynamicLibrary { : ["$ORIGIN", "$ORIGIN/.."] cpp.includePaths: [ ".", ".." ] - ProductModule { + Export { Depends { name: "cpp" } cpp.includePaths: [ "." ] } diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs index 20041d86340..31ea51c9400 100644 --- a/src/libs/cplusplus/cplusplus.qbs +++ b/src/libs/cplusplus/cplusplus.qbs @@ -168,7 +168,7 @@ QtcLibrary { "images/var_prot.png", ] - ProductModule { + Export { Depends { name: "cpp" } cpp.includePaths: [ "../3rdparty" diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs index bf0efb0611c..4253e0bb09c 100644 --- a/src/libs/qmljs/qmljs.qbs +++ b/src/libs/qmljs/qmljs.qbs @@ -106,7 +106,7 @@ QtcLibrary { "iscriptevaluator.h" ] - ProductModule { + Export { Depends { name: "cpp" } Depends { name: "LanguageUtils" } } diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index edc5663c914..571821c22c9 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -114,7 +114,7 @@ QtcLibrary { ] } - ProductModule { + Export { Depends { name: "Qt"; submodules: ["widgets", "network"] } } } diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 885a6caa2eb..b8f9bd76325 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -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: [ ".." ] // ### ] diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index e6ff4f33738..518df2a3a76 100644 --- a/src/plugins/QtcPlugin.qbs +++ b/src/plugins/QtcPlugin.qbs @@ -50,7 +50,7 @@ Product { qbs.installDir: project.ide_plugin_path + "/" + provider } - ProductModule { + Export { Depends { name: "ExtensionSystem" } } } diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs index b3b062258e8..7a42610f1ba 100644 --- a/src/plugins/analyzerbase/analyzerbase.qbs +++ b/src/plugins/analyzerbase/analyzerbase.qbs @@ -44,7 +44,7 @@ QtcPlugin { "images/analyzer_start_small.png", ] - ProductModule { + Export { Depends { name: "CPlusPlus" } } } diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 6b480f6fd19..93c635d93ae 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -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) diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index fc98dfaa4c1..d48f09016e4 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -254,7 +254,7 @@ QtcPlugin { ] } - ProductModule { + Export { Depends { name: "cpp" } Depends { name: "Aggregation" } Depends { name: "Utils" } diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 059a3dfc7e2..6f7114b3703 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -123,7 +123,7 @@ QtcPlugin { cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"']) } - ProductModule { + Export { Depends { name: "CPlusPlus" } } } diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 77cedce2d96..688805e2141 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -303,7 +303,7 @@ QtcPlugin { ] } - ProductModule { + Export { Depends { name: "cpp" } Depends { name: "QtcSsh" } cpp.includePaths: ["."] diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 454757cf3e4..f90354e2b78 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -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; } diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 9f18893ff5d..1e45604c9ab 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -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; diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index 283d490b957..8d4a4879da5 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -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())); diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index dd76e03c3f5..3b9252f26d4 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -354,7 +354,7 @@ QtcPlugin { files: ["outputparser_test.h", "outputparser_test.cpp"] } - ProductModule { + Export { Depends { name: "Qt.network" } } } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 7fe45f1b27b..50120f9fa4f 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -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"); diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs index 3e140130da9..8ee25012060 100644 --- a/src/plugins/qmljseditor/qmljseditor.qbs +++ b/src/plugins/qmljseditor/qmljseditor.qbs @@ -85,7 +85,7 @@ QtcPlugin { "images/qmlfile.png", ] - ProductModule { + Export { Depends { name: "QmlJSTools" } } } diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs index d787c842b1c..3848531bd52 100644 --- a/src/plugins/qmljstools/qmljstools.qbs +++ b/src/plugins/qmljstools/qmljstools.qbs @@ -78,7 +78,7 @@ QtcPlugin { files: ["qmljstools_test.cpp"] } - ProductModule { + Export { Depends { name: "CppTools" } Depends { name: "QmlDebug" } } diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index df1b1e5fd8a..841c171015b 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -109,8 +109,7 @@ QtcPlugin { "QtSupport.mimetypes.xml", ] - - ProductModule { + Export { Depends { name: "cpp" } cpp.includePaths: "../../shared" cpp.defines: [ diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 16cd3eaa8ff..36336e6d65a 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -113,7 +113,7 @@ QtcPlugin { "images/embeddedtarget.png", ] - ProductModule { + Export { Depends { name: "Core" } Depends { name: "QtcSsh" } } diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index 099937ad0e2..28451cae8df 100644 --- a/src/plugins/texteditor/texteditor.qbs +++ b/src/plugins/texteditor/texteditor.qbs @@ -268,7 +268,7 @@ QtcPlugin { ] } - ProductModule { + Export { Depends { name: "Find" } Depends { name: "Locator" } } |