From aaafacfbdf8d7e1bd786b4b7c5bfa1edfc5c23cc Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 25 Feb 2015 16:49:22 +0100 Subject: [PATCH 1/3] Bump version Change-Id: I360a64f44258b7af6443db41163fd385102b2c60 Reviewed-by: Eike Ziller --- qtcreator.pri | 2 +- qtcreator.qbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index ca06e9fa842..14e82793910 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,7 +1,7 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 3.3.1 +QTCREATOR_VERSION = 3.3.2 QTCREATOR_COMPAT_VERSION = 3.3.0 BINARY_ARTIFACTS_BRANCH = 3.3 diff --git a/qtcreator.qbs b/qtcreator.qbs index 2e32719b114..7940c103c2f 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,7 +5,7 @@ Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '3' - property string ide_version_release: '1' + property string ide_version_release: '2' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '3' property string ide_compat_version_minor: '3' From d4d677ed2536408d83676212496855370d340702 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 25 Feb 2015 14:56:16 +0100 Subject: [PATCH 2/3] QmlDesigner: Do not set QML_IMPORT_PATH for the fallback puppet QML[2]_IMPORT_PATH does override the search path defined in the qt.conf. This means that defining QML_IMPORT_PATH does break the fallback puppet. Task-number: QTCREATORBUG-14031 Change-Id: I1441d18f7068df2b8068c70519507088ab41eed8 Reviewed-by: Eike Ziller --- .../designercore/instances/puppetcreator.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 075b3f8b3c5..8b203618eaf 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -345,10 +345,14 @@ QProcessEnvironment PuppetCreator::processEnvironment() const environment.set("QML_BAD_GUI_RENDER_LOOP", "true"); environment.set("QML_USE_MOCKUPS", "true"); environment.set("QML_PUPPET_MODE", "true"); - if (m_puppetVersion == Qml1Puppet) - environment.appendOrSet("QML_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); - else - environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); + + if (m_availablePuppetType != FallbackPuppet) { + if (m_puppetVersion == Qml1Puppet) + environment.appendOrSet("QML_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); + else + environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); + } + return environment.toProcessEnvironment(); } From b8db05c3ffad7fb2b46b35389cf86275c7e8c735 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 25 Feb 2015 11:19:22 +0100 Subject: [PATCH 3/3] OS X: Make deployment of clang lib less fragile. Ensure that the correct rpath is added, even if we fail to remove the old one. Change-Id: I96e37d0e26b04f240300244aa93f434a60013410 Reviewed-by: Nikolai Kosjar Reviewed-by: Eike Ziller --- scripts/deployqtHelper_mac.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 85f7a080c53..974e008043d 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -65,7 +65,8 @@ if [ $LLVM_INSTALL_DIR ]; then _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" fi # this will just fail when run a second time on libClangCodeModel - xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -delete_rpath "$LLVM_INSTALL_DIR/lib" "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -add_rpath "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true fi #### macdeployqt