Fixed all qttools references to the bin directory.

diff --git a/src/assistant/tools/assistant/assistant.pro b/src/assistant/tools/assistant/assistant.pro
index 580db99..e8bc867 100644 (file)
--- a/src/assistant/tools/assistant/assistant.pro
+++ b/src/assistant/tools/assistant/assistant.pro
@@ -8,7 +8,7 @@ CONFIG += qt \
     help
 QT += network help
 PROJECTNAME = Assistant
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 DEPENDPATH += ../shared

diff --git a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
index 66e920f..6471faf 100644 (file)
--- a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+++ b/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
@@ -2,7 +2,7 @@ QT += xml \
     network \
     help
 TEMPLATE = app
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 TARGET = qcollectiongenerator
 CONFIG += qt \
     warn_on \

diff --git a/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/src/assistant/tools/qhelpconverter/qhelpconverter.pro
index ce3083e..f875476 100644 (file)
--- a/src/assistant/tools/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/tools/qhelpconverter/qhelpconverter.pro
@@ -1,7 +1,7 @@
 QT += xml help
 TEMPLATE = app
 TARGET = qhelpconverter
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 CONFIG += qt warn_on help
 
 target.path=$$[QT_INSTALL_BINS]

diff --git a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
index 82bec1d..f4d96c1 100644 (file)
--- a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = qhelpgenerator
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 CONFIG += qt warn_on help console
 CONFIG -= app_bundle
 QT += network help

diff --git a/src/checksdk/checksdk.pro b/src/checksdk/checksdk.pro
index a513981..d3b3e39 100644 (file)
--- a/src/checksdk/checksdk.pro
+++ b/src/checksdk/checksdk.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-DESTDIR = ../../bin
+DESTDIR = $$QT.designer.bins
 TARGET = checksdk
 DEPENDPATH += .
 INCLUDEPATH += .

diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 852ec23..aeeb93a 100644 (file)
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -6,7 +6,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 CONFIG += qt depend_prl no_objective_c designer
 win32|mac: CONFIG += debug_and_release
 DESTDIR = $$QT_BUILD_TREE/lib
-!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
+!wince*:DLLDESTDIR = $$QT.designer.bins
 QT += designer
 
 # QtDesignerComponents uses

diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index b3de616..166c253 100644 (file)
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -1,6 +1,6 @@
 load(qt_module)
 
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 QT += xml network designer
 contains(QT_CONFIG, script): QT += script
 build_all:!build_pass {

diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 41fe031..d23e40d 100644 (file)
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -7,7 +7,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 CONFIG += qt
 win32|mac: CONFIG += debug_and_release
 DESTDIR = $$QT_BUILD_TREE/lib
-!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
+!wince*:DLLDESTDIR = $$QT.designer.bins
 INCLUDEPATH += $$QT.designer.includes
 
 isEmpty(QT_MAJOR_VERSION) {

diff --git a/src/kmap2qmap/kmap2qmap.pro b/src/kmap2qmap/kmap2qmap.pro
index cc8200b..3fddf72 100644 (file)
--- a/src/kmap2qmap/kmap2qmap.pro
+++ b/src/kmap2qmap/kmap2qmap.pro
@@ -1,6 +1,6 @@
 
 TEMPLATE = app
-DESTDIR = ../../bin
+DESTDIR = $$QT.designer.bins
 QT = core
 CONFIG += console
 CONFIG -= app_bundle

diff --git a/src/linguist/lconvert/lconvert.pro b/src/linguist/lconvert/lconvert.pro
index 66a194e..0f88a7d 100644 (file)
--- a/src/linguist/lconvert/lconvert.pro
+++ b/src/linguist/lconvert/lconvert.pro
@@ -1,7 +1,7 @@
 
 TEMPLATE = app
 TARGET = lconvert
-DESTDIR         = ../../../bin
+DESTDIR         = $$QT.designer.bins
 
 QT -= gui
 

diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index 93b4ace..9e87c80 100644 (file)
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TEMPLATE = app
 LANGUAGE = C++
-DESTDIR = ../../../bin
+DESTDIR = $$QT.designer.bins
 
 QT += xml designer
 

diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro
index 83692c9..1ee073f 100644 (file)
--- a/src/linguist/lrelease/lrelease.pro
+++ b/src/linguist/lrelease/lrelease.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TEMPLATE        = app
 TARGET          = lrelease
-DESTDIR         = ../../../bin
+DESTDIR         = $$QT.designer.bins
 
 QT              -= gui
 

diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index 5f1996e..b620af2 100644 (file)
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TEMPLATE        = app
 TARGET          = lupdate
-DESTDIR          = ../../../bin
+DESTDIR          = $$QT.designer.bins
 
 QT              -= gui
 

diff --git a/src/macdeployqt/macdeployqt/macdeployqt.pro b/src/macdeployqt/macdeployqt/macdeployqt.pro
index 3e56024..57d5c17 100644 (file)
--- a/src/macdeployqt/macdeployqt/macdeployqt.pro
+++ b/src/macdeployqt/macdeployqt/macdeployqt.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = macdeployqt
 DEPENDPATH += .
 INCLUDEPATH += .
-DESTDIR     = ../../../bin
+DESTDIR     = $$QT.designer.bins
 
 # Input
 SOURCES += main.cpp ../shared/shared.cpp

diff --git a/src/makeqpf/makeqpf.pro b/src/makeqpf/makeqpf.pro
index c2dc9cc..b6c8a49 100644 (file)
--- a/src/makeqpf/makeqpf.pro
+++ b/src/makeqpf/makeqpf.pro
@@ -7,7 +7,7 @@ TARGET =
 DEPENDPATH += .
 INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src
 CONFIG += console
-DESTDIR = ../../bin
+DESTDIR = $$QT.designer.bins
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target

diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro
index c24e6ed..60cd6d3 100644 (file)
--- a/src/pixeltool/pixeltool.pro
+++ b/src/pixeltool/pixeltool.pro
@@ -7,7 +7,7 @@ build_all:!build_pass {
     CONFIG += release
 }
 
-DESTDIR     = ../../bin
+DESTDIR     = $$QT.designer.bins
 
 DEPENDPATH += .
 INCLUDEPATH += .

diff --git a/src/qdbus/qdbus/qdbus.pro b/src/qdbus/qdbus/qdbus.pro
index ea732ef..f7ae279 100644 (file)
--- a/src/qdbus/qdbus/qdbus.pro
+++ b/src/qdbus/qdbus/qdbus.pro
@@ -1,5 +1,5 @@
 SOURCES = qdbus.cpp
-DESTDIR = ../../../bin
+DESTDIR = $$QT.designer.bins
 TARGET = qdbus
 QT = core xml
 CONFIG += qdbus

diff --git a/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro b/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro
index 9ee1d37..301a800 100644 (file)
--- a/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,5 +1,5 @@
 SOURCES = qdbuscpp2xml.cpp
-DESTDIR = ../../../bin
+DESTDIR = $$QT.designer.bins
 TARGET = qdbuscpp2xml
 QT = core xml
 CONFIG += qdbus

diff --git a/src/qdbus/qdbusviewer/qdbusviewer.pro b/src/qdbus/qdbusviewer/qdbusviewer.pro
index 6727691..090f119 100644 (file)
--- a/src/qdbus/qdbusviewer/qdbusviewer.pro
+++ b/src/qdbus/qdbusviewer/qdbusviewer.pro
@@ -12,7 +12,7 @@ SOURCES         = qdbusviewer.cpp \
 
 RESOURCES += qdbusviewer.qrc
 
-DESTDIR = ../../../bin
+DESTDIR = $$QT.designer.bins
 
 CONFIG += qdbus
 QT += xml

diff --git a/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro b/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro
index 6f78c7c..e3ac238 100644 (file)
--- a/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,5 +1,5 @@
 SOURCES = qdbusxml2cpp.cpp
-DESTDIR = ../../../bin
+DESTDIR = $$QT.designer.bins
 TARGET = qdbusxml2cpp
 QT = core xml
 CONFIG += qdbus

diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro
index bd758d9..180fe45 100644 (file)
--- a/src/qtconfig/qtconfig.pro
+++ b/src/qtconfig/qtconfig.pro
@@ -22,7 +22,7 @@ RESOURCES    = qtconfig.qrc
 
 PROJECTNAME        = Qt Configuration
 TARGET             = qtconfig
-DESTDIR            = ../../bin
+DESTDIR            = $$QT.designer.bins
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS        += target

diff --git a/src/qtestlib/wince/cetcpsync/cetcpsync.pro b/src/qtestlib/wince/cetcpsync/cetcpsync.pro
index d1d7c99..0e3205c 100644 (file)
--- a/src/qtestlib/wince/cetcpsync/cetcpsync.pro
+++ b/src/qtestlib/wince/cetcpsync/cetcpsync.pro
@@ -1,5 +1,5 @@
 TARGET   = cetcpsync
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 CONFIG   += console
 CONFIG   -= app_bundle
 QT       += network

diff --git a/src/qtestlib/wince/cetest/cetest.pro b/src/qtestlib/wince/cetest/cetest.pro
index 82747da..af71118 100644 (file)
--- a/src/qtestlib/wince/cetest/cetest.pro
+++ b/src/qtestlib/wince/cetest/cetest.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = cetest
-DESTDIR = ../../../../bin
+DESTDIR = $$QT.designer.bins
 build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release

diff --git a/src/qttracereplay/qttracereplay.pro b/src/qttracereplay/qttracereplay.pro
index 691a66b..a4d8abb 100644 (file)
--- a/src/qttracereplay/qttracereplay.pro
+++ b/src/qttracereplay/qttracereplay.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TEMPLATE = app
 
-DESTDIR     = ../../bin
+DESTDIR     = $$QT.designer.bins
 
 DEPENDPATH += .
 INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src

diff --git a/src/qvfb/qvfb.pro b/src/qvfb/qvfb.pro
index c101d00..c5207bb 100644 (file)
--- a/src/qvfb/qvfb.pro
+++ b/src/qvfb/qvfb.pro
@@ -1,7 +1,7 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on uic
 TARGET          = qvfb
-DESTDIR         = ../../bin
+DESTDIR         = $$QT.designer.bins
 
 !win32:!embedded:!mac:CONFIG += x11