purge QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT

they are equivalent to QT_INSTALL_(HEADERS|LIBS)/get.

Change-Id: Ic4b47f3ca7db55785b96f19020a2fa020a8d25bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/configure b/configure
index fd6e494..93533c2 100755 (executable)
--- a/configure
+++ b/configure
@@ -5896,10 +5896,6 @@ QT_SOURCE_TREE = \$\$quote($relpath)
 QT_BUILD_TREE = \$\$quote($outpath)
 QT_BUILD_PARTS = $CFG_BUILD_PARTS
 
-#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
-QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
-QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
-
 include(\$\$PWD/mkspecs/qmodule.pri)
 CONFIG += dylib depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build
 

diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
index 8c87826..e1356d2 100644 (file)
--- a/mkspecs/aix-g++-64/qmake.conf
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index 0651564..f079f69 100644 (file)
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index ed98a01..a3a52c5 100644 (file)
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -41,8 +41,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 6b43648..4a352a8 100644 (file)
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -41,8 +41,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 4c88e41..739f508 100644 (file)
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -9,8 +9,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      =
 QMAKE_LIBDIR_X11      =
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   =
 QMAKE_LIBDIR_OPENGL   =
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL

diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 6ba5532..56302c7 100644 (file)
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -7,8 +7,6 @@ QMAKE_RESOURCE          = /Developer/Tools/Rez
 QMAKE_EXTENSION_SHLIB  = dylib
 
 QMAKE_LIBDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /System/Library/Frameworks/OpenGL.framework/Headers \
        /System/Library/Frameworks/AGL.framework/Headers/
 

diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index d7c2f9f..b0949c1 100644 (file)
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -45,9 +45,6 @@ QMAKE_INCDIR            = $${QNX_DIR}/usr/include $${QNX_DIR}/usr/include/freety
 QMAKE_LIBDIR            = $${QNX_DIR}/$${QNX_CPUDIR}/lib $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
 QMAKE_LFLAGS            = -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
 
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
-
 QMAKE_CXX               = $$QMAKE_CC -lang-c++
 
 QMAKE_LINK_C            = $$QMAKE_CC

diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 6b7a2d7..6cc0edf 100644 (file)
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -45,8 +45,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -EHs-c-
 
 QMAKE_INCDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC           = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP       = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<

diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 286f8ea..cacc9bf 100644 (file)
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -41,8 +41,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 3f6793f..1d46d7a 100644 (file)
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -49,8 +49,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 9950f95..1c9d61c 100644 (file)
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -38,7 +38,7 @@ plugin { #Qt plugins
 }
 
 #handle includes
-INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes
+INCLUDEPATH = $$[QT_INSTALL_HEADERS/get] $$INCLUDEPATH #prepending prevents us from picking up "stale" includes
 
 QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN
 for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
@@ -119,11 +119,8 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
     }
 }
 
-
-
 #specific module settings
-!isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
-QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
+QMAKE_LIBDIR = $$[QT_INSTALL_LIBS/get] $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
 
 qtestlib {
     warning("CONFIG+=qtestlib is deprecated. Use QT+=testlib instead.")

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 49966ac..ff1fc4b 100644 (file)
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -117,9 +117,9 @@ unix|win32-g++* {
    QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$TARGET
    QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS/raw]
    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-   include_replace.match = $$QMAKE_INCDIR_QT
+   include_replace.match = $$[QT_INSTALL_HEADERS/get]
    include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
-   lib_replace.match = $$QMAKE_LIBDIR_QT
+   lib_replace.match = $$[QT_INSTALL_LIBS/get]
    lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
    prefix_replace.match = $$QT_BUILD_TREE
    prefix_replace.replace = $$[QT_INSTALL_PREFIX/raw]

diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 35501d5..2838c24 100644 (file)
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -17,8 +17,6 @@ QMAKE_INCDIR          = /usr/local/include
 QMAKE_LIBDIR           = /usr/local/lib
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
index 8cff625..755f7ee 100644 (file)
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -17,8 +17,6 @@ QMAKE_INCDIR          = /usr/local/include
 QMAKE_LIBDIR           = /usr/local/lib
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index 7ad3427..0509d75 100644 (file)
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -66,8 +66,6 @@ QMAKE_INCDIR          = /usr/local/include
 QMAKE_LIBDIR           = /usr/local/lib
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 65120d3..9463f73 100644 (file)
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -83,8 +83,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 

diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index 370be04..2e6cb2c 100644 (file)
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -81,8 +81,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/X11R6
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 

diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 367e9a6..9888e17 100644 (file)
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -62,8 +62,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/X11R6
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 

diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index bfa71b6..33f1c7c 100644 (file)
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -43,8 +43,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           = /usr/lib/pa20_64
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/Mesa/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 

diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 19dea82..1c4e5ef 100644 (file)
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -43,8 +43,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       = /usr/lib/X11R6
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/Mesa/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/Mesa/lib /usr/contrib/X11R6/lib
 

diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index 54295de..ffc36b0 100644 (file)
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -39,8 +39,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/hpux32/X11R6
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32
 

diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index 06749cd..ee6d1ea 100644 (file)
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -82,8 +82,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/hpux64/X11R6
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
 

diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index b9d0459..44492ca 100644 (file)
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -48,8 +48,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           = /usr/lib/hpux64
 QMAKE_INCDIR_X11       = /usr/include/X11R6
 QMAKE_LIBDIR_X11       = /usr/lib/hpux64/X11R6
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
 

diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index fda7ff2..7337d42 100644 (file)
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -16,8 +16,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      = /usr/X11R6/include
 QMAKE_LIBDIR_X11      = /usr/X11R6/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL

diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index db824ad..2b74272 100644 (file)
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -75,8 +75,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index f11faa5..2e41557 100644 (file)
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -75,8 +75,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index dc1f127..0ee4a37 100644 (file)
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -41,8 +41,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 674ae6e..fdcb6b8 100644 (file)
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -41,8 +41,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 87b361c..269a6af 100644 (file)
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index d9b5772..f92a430 100644 (file)
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -42,8 +42,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 5eb0650..dd1a329 100644 (file)
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -49,8 +49,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 5326348..97315b4 100644 (file)
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -51,8 +51,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index fe9e560..b0a2986 100644 (file)
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -42,8 +42,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index 78d0b00..961510c 100644 (file)
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -43,8 +43,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /usr/include/X11
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/include/GL
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf
index 77c300a..579eccd 100644 (file)
--- a/mkspecs/macx-xlc/qmake.conf
+++ b/mkspecs/macx-xlc/qmake.conf
@@ -45,8 +45,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /System/Library/Frameworks/OpenGL.framework/Headers \
         /System/Library/Frameworks/AGL.framework/Headers/
 QMAKE_LIBDIR_OPENGL    =

diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index f32ab5f..bf94ca7 100644 (file)
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          = /usr/local/include
 QMAKE_LIBDIR           = /usr/local/lib
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 5fba495..1eb2482 100644 (file)
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          = /usr/local/include
 QMAKE_LIBDIR           = /usr/local/lib
 QMAKE_INCDIR_X11       = /usr/X11R6/include
 QMAKE_LIBDIR_X11       = /usr/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 

diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 45dac48..9948e05 100644 (file)
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -41,8 +41,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       = /usr/X/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index b4839eb..73d1ff9 100644 (file)
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index ab8a847..6a046f2 100644 (file)
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -61,8 +61,6 @@ QMAKE_INCDIR          = /usr/sfw/include
 QMAKE_LIBDIR           = /usr/sfw/lib/64
 QMAKE_INCDIR_X11       = /usr/openwin/include
 QMAKE_LIBDIR_X11       = /usr/openwin/lib/64
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/openwin/include
 QMAKE_LIBDIR_OPENGL    = /usr/openwin/lib/64
 

diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index aa3fb0d..58c5fe7 100644 (file)
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -44,8 +44,6 @@ QMAKE_INCDIR          = /usr/sfw/include
 QMAKE_LIBDIR           = /usr/sfw/lib
 QMAKE_INCDIR_X11       = /usr/openwin/include
 QMAKE_LIBDIR_X11       = /usr/openwin/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/openwin/include
 QMAKE_LIBDIR_OPENGL    = /usr/openwin/lib
 

diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 71b235b..d6e4058 100644 (file)
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -63,8 +63,6 @@ QMAKE_INCDIR          = /usr/sfw/include
 QMAKE_LIBDIR           = /usr/sfw/lib/64
 QMAKE_INCDIR_X11       = /usr/openwin/include
 QMAKE_LIBDIR_X11       = /usr/openwin/lib/64
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/openwin/include
 QMAKE_LIBDIR_OPENGL    = /usr/openwin/lib/64
 

diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 762d792..1c2b91f 100644 (file)
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -46,8 +46,6 @@ QMAKE_INCDIR          = /usr/sfw/include
 QMAKE_LIBDIR           = /usr/sfw/lib
 QMAKE_INCDIR_X11       = /usr/openwin/include
 QMAKE_LIBDIR_X11       = /usr/openwin/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/openwin/include
 QMAKE_LIBDIR_OPENGL    = /usr/openwin/lib
 

diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index 6854f24..2f08b07 100644 (file)
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index a914ba1..46c06d4 100644 (file)
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 45af184..d273462 100644 (file)
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -43,8 +43,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       = /usr/X/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index a1b0061..2c9fa85 100644 (file)
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -42,8 +42,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       = /usr/X/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index f3d9e94..969d22f 100644 (file)
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -30,8 +30,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       =
 QMAKE_LIBDIR_X11       =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 

diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index ba3a170..53cc955 100644 (file)
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -82,8 +82,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      =
 QMAKE_LIBDIR_X11      =
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   =
 QMAKE_LIBDIR_OPENGL   =
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL

diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 048f0f0..d269be2 100644 (file)
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -22,8 +22,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = /opt/X11R6/include
 QMAKE_LIBDIR_X11       = /opt/X11R6/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /opt/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /opt/X11R6/lib
 

diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf
index 0636ca7..4fed2b5 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-641/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf
@@ -66,9 +66,6 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR           =
 QMAKE_LIBDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
-
 
 QMAKE_LIBS             = -lm -lz
 QMAKE_LIBS_DYNLOAD     =

diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
index 608da69..eb3b02b 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
@@ -68,8 +68,6 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CLFAGS_THREAD
 
 QMAKE_INCDIR           =
 QMAKE_LIBDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 #QMAKE_LIBS            = -lunix
 QMAKE_LIBS             =

diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
index 395f4fe..903c655 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
@@ -64,8 +64,6 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR           =
 QMAKE_LIBDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 #QMAKE_LIBS            = -lunix
 QMAKE_LIBS             =

diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
index 433b091..baa3b04 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
@@ -64,8 +64,6 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CLFAGS_THREAD
 
 QMAKE_INCDIR           =
 QMAKE_LIBDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 #QMAKE_LIBS            = -lunix
 QMAKE_LIBS             =

diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index 2bd6c00..68fa5ec 100644 (file)
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -68,8 +68,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      = $(WIND_HOME)/GSS/include
 QMAKE_LIBDIR_X11      = $(WIND_HOME)/GSS/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = $$QMAKE_INCDIR_X11
 QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
 

diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 3ed5190..19b4507 100644 (file)
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -68,8 +68,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      = $(WIND_HOME)/GSS/include
 QMAKE_LIBDIR_X11      = $(WIND_HOME)/GSS/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = $$QMAKE_INCDIR_X11
 QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
 

diff --git a/mkspecs/unsupported/win32-borland/qmake.conf b/mkspecs/unsupported/win32-borland/qmake.conf
index c1aa7e4..55f1d71 100644 (file)
--- a/mkspecs/unsupported/win32-borland/qmake.conf
+++ b/mkspecs/unsupported/win32-borland/qmake.conf
@@ -42,8 +42,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -x-
 
 QMAKE_INCDIR           =
 QMAKE_LIBDIR           = $(BCB)\\lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC           = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
 QMAKE_RUN_CC_IMP       = $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<

diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index e057af2..abf1657 100644 (file)
--- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
+++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf
@@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
 QMAKE_INCDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC           = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP       = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<

diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index 29681c1..1bb5447 100644 (file)
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<

diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 1e98789..5189cb1 100644 (file)
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
 QMAKE_INCDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC           = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP       = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 8a7260a..50d815d 100644 (file)
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -40,8 +40,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC           = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP       = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<

diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index e093ddf..3bf2422 100644 (file)
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -47,8 +47,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<

diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 71969ab..d79c94e 100644 (file)
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -49,8 +49,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<

diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 9499cab..7d662db 100644 (file)
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 1fe19b4..2e813af 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2583,11 +2583,6 @@ void Configure::generateCachefile()
         moduleStream << "QT_SOURCE_TREE  = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
         moduleStream << "QT_BUILD_PARTS  = " << buildParts.join(" ") << endl << endl;
 
-        //so that we can build without an install first (which would be impossible)
-        moduleStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl;
-        moduleStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl;
-        moduleStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl;
-
         QString hostSpec = dictionary[ "QMAKESPEC" ];
         QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : hostSpec;
         QString xmkspec_path = sourcePath + "/mkspecs/" + targetSpec;