1 files changed, 8 insertions, 11 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 7c3ce3ef89..6a6116c8db 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -3,8 +3,8 @@
 # and the configures.
 
 option(host_build)
-CONFIG += console
-CONFIG -= qt app_bundle
+CONFIG += cmdline
+CONFIG -= qt
 
 DEFINES += \
     PROEVALUATOR_FULL \
@@ -96,7 +96,7 @@ HEADERS += \
 bp = $$shadowed(..)
 INCLUDEPATH += \
     $$bp/include $$bp/include/QtCore \
-    $$bp/include/QtCore/$$QT_VERSION $$bp/include/QtCore/$$QT_VERSION/QtCore
+    $$bp/include/QtCore/$$QT_VERSION $$bp/include/QtCore/$$QT_VERSION/QtCore \
     $$bp/src/corelib/global
 
 VPATH += \
@@ -152,7 +152,6 @@ SOURCES += \
     qstringlist.cpp \
     qsystemerror.cpp \
     qtemporaryfile.cpp \
-    qtextcodec.cpp \
     qtextstream.cpp \
     qutfcodec.cpp \
     quuid.cpp \
@@ -183,18 +182,17 @@ HEADERS += \
     qglobal.h \
     qhash.h \
     qiodevice.h \
-    qjson.h \
+    qjson_p.h \
     qjsonarray.h \
     qjsondocument.h \
     qjsonobject.h \
-    qjsonparser.h \
+    qjsonparser_p.h \
     qjsonvalue.h \
-    qjsonwriter.h \
+    qjsonwriter_p.h \
     qlinkedlist.h \
     qlist.h \
     qlocale.h \
     qlocale_tools_p.h \
-    qmalloc.h \
     qmap.h \
     qmetatype.h \
     qnumeric.h \
@@ -204,14 +202,13 @@ HEADERS += \
     qstringmatcher.h \
     qsystemerror_p.h \
     qtemporaryfile.h \
-    qtextcodec.h \
     qtextstream.h \
-    qutfcodec.h \
+    qutfcodec_p.h \
     quuid.h \
     qvector.h \
     qversionnumber.h \
     qxmlstream.h \
-    qxmlutils.h
+    qxmlutils_p.h
 
 unix {
     SOURCES += \