diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-09-07 17:04:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-08 11:26:41 +0200 |
| commit | c4fb17bef9175557ab071a154b6799e098fdb379 (patch) | |
| tree | 38158e6d1e3e5b2c8477c7a675a9a87267276dd8 | |
| parent | fa3fe48288e199a7efb926707d0280a65f6ffab0 (diff) | |
| download | qt-creator-c4fb17bef9175557ab071a154b6799e098fdb379.tar.gz | |
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>
| -rw-r--r-- | lib/qtcreator/qtcomponents/qtcomponents.pro | 2 | ||||
| -rw-r--r-- | src/libs/qtcomponents/styleitem/styleitem.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro index 9a3dc0e67f..5cf2d9adb9 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 aa52c88a13..90b8eee8ce 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 24f0c19b72..8f56b17cc1 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 } |