File qt-creator-respect-64bit-library-path.diff of Package qt-creator

Overview Repositories Revisions Requests Users Attributes Meta

File qt-creator-respect-64bit-library-path.diff of Package qt-creator

commit c4fb17bef9175557ab071a154b6799e098fdb379
Author: Daniel Molkentin <daniel.molkentin@nokia.com>
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 <qt_sanity_bot@ovi.com>
    Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

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
 }

Places

File qt-creator-respect-64bit-library-path.diff of Package qt-creator

Places