From 0b37ec3321323a242ad63459afcf01ca9ac61988 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 13 Apr 2012 17:46:42 +0200
Subject: [PATCH] don't use qt_module_config for winmain

it is not really a Qt module, and pretending causes some messups.

Change-Id: Id0980f7c00d6d176dd4937f8b265b8b571aa1277
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 src/winmain/winmain.pro | 48 ++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index 1d2c097c20..6f27ce7381 100644
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -1,24 +1,32 @@
+load(qt_module)
+
 # Additional Qt project file for qtmain lib on Windows
-TEMPLATE = lib
-TARGET   = qtmain
-QT       =
-
-CONFIG  += staticlib warn_on
-CONFIG  -= qt shared
-
-win32 {
-    win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi
-    win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi
-    win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7
-    win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7
-    win32-g++*:DEFINES += QT_NEEDS_QMAIN
-    win32-borland:DEFINES += QT_NEEDS_QMAIN
-    SOURCES = qtmain_win.cpp
-    CONFIG += png
-    INCLUDEPATH += tmp $$QT.core.includes
-}
-
 !win32:error("$$_FILE_ is intended only for Windows!")
-load(qt_module_config)
+
+TEMPLATE = lib
+TARGET = qtmain
 DESTDIR = $$QT.core.libs
+
+CONFIG += static warn_on depend_includepath
+CONFIG -= fix_output_dirs
+QT =   # qt.prf is still needed for some DEFINES, etc.
+
+contains(QT_CONFIG, build_all):CONFIG += build_all
+
+win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi
+win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi
+win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7
+win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7
+win32-g++*|win32-borland:DEFINES += QT_NEEDS_QMAIN
+
+INCLUDEPATH += $$QT.core.includes
+
+SOURCES = qtmain_win.cpp
+
+load(qt_installs)
+
+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
+
+load(qt_targets)
+
 wince*:QMAKE_POST_LINK =