From f82f1a6a965610a7f1ed3fd2c8583c3f096a6377 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 31 Oct 2013 16:39:55 +0100
Subject: bring fake qmake project up to snuff

Change-Id: Ib5b51ea2198db9fb202d957ab08b47cd32e99723
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 qmake/qmake.pri | 15 ++++++++++-----
 qmake/qmake.pro | 38 ++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 5012bd0206..661b787a55 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -1,6 +1,3 @@
-SKIP_DEPENDS += qconfig.h qmodules.h
-DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_COMPRESS QT_NO_UNICODETABLES \
-           QT_NO_GEOM_VARIANT QT_NO_DATASTREAM
 
 #qmake code
 SOURCES += project.cpp property.cpp main.cpp \
@@ -37,7 +34,6 @@ contains(QT_EDITION, OpenSource) {
 }
 
 bootstrap { #Qt code
-   DEFINES+=QT_NO_THREAD
    SOURCES+= \
         qbitarray.cpp \
         qbuffer.cpp \
@@ -160,7 +156,16 @@ bootstrap { #Qt code
         CFLAGS += -fhonor-std
         LFLAGS += -lcpp
     }
-    DEFINES *= QT_NO_QOBJECT QT_CRYPTOGRAPHICHASH_ONLY_SHA1
+
+    DEFINES += \
+        QT_BOOTSTRAPPED \
+        QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_COMPONENT QT_NO_COMPRESS \
+        QT_NO_THREAD QT_NO_QOBJECT QT_NO_GEOM_VARIANT QT_NO_DATASTREAM \
+        QT_CRYPTOGRAPHICHASH_ONLY_SHA1 QT_JSON_READONLY
+
+    INCLUDEPATH += \
+        $$QT.core.includes $$QT.core_private.includes \
+        $$shadowed(../src/corelib/global)
 } else {
     CONFIG += qt
     QT = core
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index e680942716..89d6ea5fc1 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -4,24 +4,21 @@
 
 option(host_build)
 CONFIG += console bootstrap
-CONFIG -= qt shared app_bundle uic
-DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
+CONFIG -= qt
+DEFINES += \
+    QT_BUILD_QMAKE \
     PROEVALUATOR_FULL
-DESTDIR = ../bin/
 
-OBJECTS_DIR = .
-MOC_DIR = .
-
-#guts
-VPATH += $$QT_SOURCE_TREE/src/corelib/global \
-         $$QT_SOURCE_TREE/src/corelib/tools \
-         $$QT_SOURCE_TREE/src/corelib/kernel \
-         $$QT_SOURCE_TREE/src/corelib/codecs \
-         $$QT_SOURCE_TREE/src/corelib/plugin \
-         $$QT_SOURCE_TREE/src/corelib/xml \
-         $$QT_SOURCE_TREE/src/corelib/io \
-         $$QT_SOURCE_TREE/src/corelib/json \
-         $$QT_SOURCE_TREE/tools/shared/windows
+VPATH += \
+    ../src/corelib/global \
+    ../src/corelib/tools \
+    ../src/corelib/kernel \
+    ../src/corelib/codecs \
+    ../src/corelib/plugin \
+    ../src/corelib/xml \
+    ../src/corelib/io \
+    ../src/corelib/json \
+    ../tools/shared/windows
 
 INCLUDEPATH += . \
            library \
@@ -30,11 +27,8 @@ INCLUDEPATH += . \
            generators/win32 \
            generators/mac \
            generators/integrity \
-           $$QT_SOURCE_TREE/include \
-           $$QT_SOURCE_TREE/include/QtCore \
-           $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION \
-           $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION/QtCore \
-           $$QT_SOURCE_TREE/tools/shared \
-           $$QT_SOURCE_TREE/qmake
+           ../tools/shared
 
 include(qmake.pri)
+
+load(qt_app)
-- 
cgit v1.2.3