feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Respect 64 bit library path for Qt Components

Browse Source 
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>
This commit is contained in:
Daniel Molkentin
2011-09-07 17:04:44 +02:00
committed by Eike Ziller
parent fa3fe48288
commit c4fb17bef9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/qtcreator/qtcomponents/qtcomponents.pro
View File

@@ -52,6 +52,6 @@ DATA_FILE_PATTERNS = \
!macx { !macx {
qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
qmlfiles.path = /lib/qtcreator/qtcomponents qmlfiles.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents
INSTALLS += qmlfiles INSTALLS += qmlfiles
} }

2
src/libs/qtcomponents/styleitem/styleitem.pro
View File

@@ -29,6 +29,6 @@ SOURCES += qtmenu.cpp \
qwheelarea.cpp qwheelarea.cpp
!macx { !macx {
target.path = /lib/qtcreator/qtcomponents/plugin target.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin
INSTALLS += target INSTALLS += target
} }

2
src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri
View File

@@ -1,5 +1,5 @@
macx { macx {
DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
} else { } else {
DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner DESTDIR = $$IDE_BUILD_TREE/$${IDE_LIBRARY_PATH}/qmldesigner
} }