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>

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
 }

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
 }

src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri

 macx {
   DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
 } else {
-  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
+  DESTDIR = $$IDE_BUILD_TREE/$${IDE_LIBRARY_PATH}/qmldesigner
 }