Make each module refer to its own bin/

Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications

diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri
index dc709bc..77beaa6 100644 (file)
--- a/modules/qt_clucene.pri
+++ b/modules/qt_clucene.pri
@@ -4,6 +4,7 @@ QT_CLUCENE_MINOR_VERSION = $$QT_MINOR_VERSION
 QT_CLUCENE_PATCH_VERSION = $$QT_PATCH_VERSION
 
 QT.clucene.name = QtCLucene
+QT.clucene.bins = $$QT_MODULE_BIN_BASE
 QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene
 QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/private
 QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch

diff --git a/modules/qt_designer.pri b/modules/qt_designer.pri
index 01340ac..a617834 100644 (file)
--- a/modules/qt_designer.pri
+++ b/modules/qt_designer.pri
@@ -4,6 +4,7 @@ QT_DESIGNER_MINOR_VERSION = $$QT_MINOR_VERSION
 QT_DESIGNER_PATCH_VERSION = $$QT_PATCH_VERSION
 
 QT.designer.name = QtDesigner
+QT.designer.bins = $$QT_MODULE_BIN_BASE
 QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesigner
 QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
 QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib

diff --git a/modules/qt_help.pri b/modules/qt_help.pri
index d99f57a..07e815d 100644 (file)
--- a/modules/qt_help.pri
+++ b/modules/qt_help.pri
@@ -4,6 +4,7 @@ QT_HELP_MINOR_VERSION = $$QT_MINOR_VERSION
 QT_HELP_PATCH_VERSION = $$QT_PATCH_VERSION
 
 QT.help.name = QtHelp
+QT.help.bins = $$QT_MODULE_BIN_BASE
 QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
 QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private
 QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib

diff --git a/modules/qt_uitools.pri b/modules/qt_uitools.pri
index 65a527e..c5160c5 100644 (file)
--- a/modules/qt_uitools.pri
+++ b/modules/qt_uitools.pri
@@ -4,6 +4,7 @@ QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
 QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
 
 QT.uitools.name = QtUiTools
+QT.uitools.bins = $$QT_MODULE_BIN_BASE
 QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools
 QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
 QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools