Hello community, here is the log from the commit of package qt-creator for openSUSE:12.1:Update:Test checked in at 2011-12-05 15:52:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/qt-creator (Old) and /work/SRC/openSUSE:12.1:Update:Test/.qt-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-creator", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/qt-creator/qt-creator.changes 2011-12-05 15:52:44.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.qt-creator.new/qt-creator.changes 2011-12-05 15:52:44.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Dec 3 18:25:33 UTC 2011 - [email protected] + +- Add qt-creator-respect-64bit-library-path.diff + * respect 64 bit library path for Qt Components (bnc#731905) + +------------------------------------------------------------------- New: ---- qt-creator-respect-64bit-library-path.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.gsBsdZ/_old 2011-12-05 15:52:45.000000000 +0100 +++ /var/tmp/diff_new_pack.gsBsdZ/_new 2011-12-05 15:52:45.000000000 +0100 @@ -32,6 +32,8 @@ Patch1: system-botan-lib.diff Patch2: hardcoded-runpath.diff Patch3: build-fix.diff +# PATCH-FIX-UPSTREAM qt-creator-respect-64bit-library-path.diff bnc#731905 [email protected] -- fix welcome screen is blank on 64bit machine +Patch4: qt-creator-respect-64bit-library-path.diff # depends on private headers and therefore needs the exact Qt version %requires_eq libqt4-x11 ######################################################################################### @@ -69,6 +71,7 @@ %endif %patch2 %patch3 +%patch4 -p1 %build %if "%{_lib}"=="lib64" @@ -115,7 +118,6 @@ %{_bindir}/qtcreator_process_stub %{_bindir}/qtpromaker %{_bindir}/qmlpuppet -/usr/lib/qtcreator/ %{_libdir}/qtcreator/ %{_datadir}/qtcreator/ %{_datadir}/applications/qtcreator.desktop ++++++ qt-creator-respect-64bit-library-path.diff ++++++ commit c4fb17bef9175557ab071a154b6799e098fdb379 Author: Daniel Molkentin <[email protected]> Date: Wed Sep 7 17:04:44 2011 +0200 Respect 64 bit library path for Qt Components Task-Number: QTCREATORBUG-6033 Change-Id: Ib1734956ea88d576354afad686880fa91ea0a38e Reviewed-on: http://codereview.qt-project.org/4371 Reviewed-by: Qt Sanity Bot <[email protected]> Reviewed-by: Eike Ziller <[email protected]> diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro index 9a3dc0e..5cf2d9a 100644 --- a/lib/qtcreator/qtcomponents/qtcomponents.pro +++ b/lib/qtcreator/qtcomponents/qtcomponents.pro @@ -52,6 +52,6 @@ DATA_FILE_PATTERNS = \ !macx { qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom - qmlfiles.path = /lib/qtcreator/qtcomponents + qmlfiles.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents INSTALLS += qmlfiles } diff --git a/src/libs/qtcomponents/styleitem/styleitem.pro b/src/libs/qtcomponents/styleitem/styleitem.pro index aa52c88..90b8eee 100644 --- a/src/libs/qtcomponents/styleitem/styleitem.pro +++ b/src/libs/qtcomponents/styleitem/styleitem.pro @@ -29,6 +29,6 @@ SOURCES += qtmenu.cpp \ qwheelarea.cpp !macx { - target.path = /lib/qtcreator/qtcomponents/plugin + target.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin INSTALLS += target } diff --git a/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri b/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri index 24f0c19..8f56b17 100644 --- a/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri +++ b/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri @@ -1,5 +1,5 @@ macx { DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner } else { - DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner + DESTDIR = $$IDE_BUILD_TREE/$${IDE_LIBRARY_PATH}/qmldesigner } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
