From d9ab36ed36d6a3371c36a82f00eeb34ab0ce7828 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 18 Mar 2011 12:12:05 +0100 Subject: [PATCH] Fixed all qttools references to the bin directory. --- .../src/assistant/tools/assistant/assistant.pro | 2 +- .../qcollectiongenerator/qcollectiongenerator.pro | 2 +- .../tools/qhelpconverter/qhelpconverter.pro | 2 +- .../tools/qhelpgenerator/qhelpgenerator.pro | 2 +- qttools/src/checksdk/checksdk.pro | 2 +- qttools/src/designer/src/components/lib/lib.pro | 2 +- qttools/src/designer/src/designer/designer.pro | 2 +- qttools/src/designer/src/lib/lib.pro | 2 +- qttools/src/kmap2qmap/kmap2qmap.pro | 2 +- qttools/src/linguist/lconvert/lconvert.pro | 2 +- qttools/src/linguist/linguist/linguist.pro | 2 +- qttools/src/linguist/lrelease/lrelease.pro | 2 +- qttools/src/linguist/lupdate/lupdate.pro | 2 +- .../src/macdeployqt/macdeployqt/macdeployqt.pro | 2 +- qttools/src/makeqpf/makeqpf.pro | 2 +- qttools/src/pixeltool/pixeltool.pro | 2 +- qttools/src/qdbus/qdbus/qdbus.pro | 2 +- qttools/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro | 2 +- qttools/src/qdbus/qdbusviewer/qdbusviewer.pro | 2 +- qttools/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro | 2 +- qttools/src/qtconfig/qtconfig.pro | 2 +- qttools/src/qtestlib/wince/cetcpsync/cetcpsync.pro | 2 +- qttools/src/qtestlib/wince/cetest/cetest.pro | 2 +- qttools/src/qttracereplay/qttracereplay.pro | 2 +- qttools/src/qvfb/qvfb.pro | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qttools/src/assistant/tools/assistant/assistant.pro b/qttools/src/assistant/tools/assistant/assistant.pro index 580db99..e8bc867 100644 --- a/qttools/src/assistant/tools/assistant/assistant.pro +++ b/qttools/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/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro index 66e920f..6471faf 100644 --- a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro +++ b/qttools/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/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro index ce3083e..f875476 100644 --- a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro +++ b/qttools/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/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro index 82bec1d..f4d96c1 100644 --- a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro +++ b/qttools/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/qttools/src/checksdk/checksdk.pro b/qttools/src/checksdk/checksdk.pro index a513981..d3b3e39 100644 --- a/qttools/src/checksdk/checksdk.pro +++ b/qttools/src/checksdk/checksdk.pro @@ -1,5 +1,5 @@ TEMPLATE = app -DESTDIR = ../../bin +DESTDIR = $$QT.designer.bins TARGET = checksdk DEPENDPATH += . INCLUDEPATH += . diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro index 852ec23..aeeb93a 100644 --- a/qttools/src/designer/src/components/lib/lib.pro +++ b/qttools/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/qttools/src/designer/src/designer/designer.pro b/qttools/src/designer/src/designer/designer.pro index b3de616..166c253 100644 --- a/qttools/src/designer/src/designer/designer.pro +++ b/qttools/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/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro index 41fe031..d23e40d 100644 --- a/qttools/src/designer/src/lib/lib.pro +++ b/qttools/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/qttools/src/kmap2qmap/kmap2qmap.pro b/qttools/src/kmap2qmap/kmap2qmap.pro index cc8200b..3fddf72 100644 --- a/qttools/src/kmap2qmap/kmap2qmap.pro +++ b/qttools/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/qttools/src/linguist/lconvert/lconvert.pro b/qttools/src/linguist/lconvert/lconvert.pro index 66a194e..0f88a7d 100644 --- a/qttools/src/linguist/lconvert/lconvert.pro +++ b/qttools/src/linguist/lconvert/lconvert.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = lconvert -DESTDIR = ../../../bin +DESTDIR = $$QT.designer.bins QT -= gui diff --git a/qttools/src/linguist/linguist/linguist.pro b/qttools/src/linguist/linguist/linguist.pro index 93b4ace..9e87c80 100644 --- a/qttools/src/linguist/linguist/linguist.pro +++ b/qttools/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/qttools/src/linguist/lrelease/lrelease.pro b/qttools/src/linguist/lrelease/lrelease.pro index 83692c9..1ee073f 100644 --- a/qttools/src/linguist/lrelease/lrelease.pro +++ b/qttools/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/qttools/src/linguist/lupdate/lupdate.pro b/qttools/src/linguist/lupdate/lupdate.pro index 5f1996e..b620af2 100644 --- a/qttools/src/linguist/lupdate/lupdate.pro +++ b/qttools/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/qttools/src/macdeployqt/macdeployqt/macdeployqt.pro b/qttools/src/macdeployqt/macdeployqt/macdeployqt.pro index 3e56024..57d5c17 100644 --- a/qttools/src/macdeployqt/macdeployqt/macdeployqt.pro +++ b/qttools/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/qttools/src/makeqpf/makeqpf.pro b/qttools/src/makeqpf/makeqpf.pro index c2dc9cc..b6c8a49 100644 --- a/qttools/src/makeqpf/makeqpf.pro +++ b/qttools/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/qttools/src/pixeltool/pixeltool.pro b/qttools/src/pixeltool/pixeltool.pro index c24e6ed..60cd6d3 100644 --- a/qttools/src/pixeltool/pixeltool.pro +++ b/qttools/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/qttools/src/qdbus/qdbus/qdbus.pro b/qttools/src/qdbus/qdbus/qdbus.pro index ea732ef..f7ae279 100644 --- a/qttools/src/qdbus/qdbus/qdbus.pro +++ b/qttools/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/qttools/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro b/qttools/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro index 9ee1d37..301a800 100644 --- a/qttools/src/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/qttools/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/qttools/src/qdbus/qdbusviewer/qdbusviewer.pro b/qttools/src/qdbus/qdbusviewer/qdbusviewer.pro index 6727691..090f119 100644 --- a/qttools/src/qdbus/qdbusviewer/qdbusviewer.pro +++ b/qttools/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/qttools/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro b/qttools/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro index 6f78c7c..e3ac238 100644 --- a/qttools/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/qttools/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/qttools/src/qtconfig/qtconfig.pro b/qttools/src/qtconfig/qtconfig.pro index bd758d9..180fe45 100644 --- a/qttools/src/qtconfig/qtconfig.pro +++ b/qttools/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/qttools/src/qtestlib/wince/cetcpsync/cetcpsync.pro b/qttools/src/qtestlib/wince/cetcpsync/cetcpsync.pro index d1d7c99..0e3205c 100644 --- a/qttools/src/qtestlib/wince/cetcpsync/cetcpsync.pro +++ b/qttools/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/qttools/src/qtestlib/wince/cetest/cetest.pro b/qttools/src/qtestlib/wince/cetest/cetest.pro index 82747da..af71118 100644 --- a/qttools/src/qtestlib/wince/cetest/cetest.pro +++ b/qttools/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/qttools/src/qttracereplay/qttracereplay.pro b/qttools/src/qttracereplay/qttracereplay.pro index 691a66b..a4d8abb 100644 --- a/qttools/src/qttracereplay/qttracereplay.pro +++ b/qttools/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/qttools/src/qvfb/qvfb.pro b/qttools/src/qvfb/qvfb.pro index c101d00..c5207bb 100644 --- a/qttools/src/qvfb/qvfb.pro +++ b/qttools/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 -- 1.7.3.2.343.g7d43d