path: root/qmake/Makefile.win32
diff options
authorOswald Buddenhagen <>2012-09-05 18:29:19 +0200
committerQt by Nokia <>2012-09-11 00:13:01 +0200
commit0e78e5080262b8fa7a86f7cd0c8716839db048f6 (patch)
tree83ca3f608a6c9a359ba783d496ffdbc9ef7a6073 /qmake/Makefile.win32
parented7594db5db7b28ce4c4646624de97b52fbf16d5 (diff)
port qmake to qt creator's qmake language evaluator
this is a monster commit which does the following things: - import the evaluator as-is from qt creator into qmake/library/ - integrate it into qmake's makefiles - overwrite proitems.h with actual special types - remove the parts of Option which are redundant with QMakeGlobals - make QMakeProperty a singleton owned by Option::globals. the dynamic handling so far made no sense. - make QMakeProject a subclass of QMakeEvaluator, with relatively few extensions the changes to existing qmake code outside project.* and option.* are minor. implementing the changes gradually would mean changing a lot of code which will be just replaced in the next commit, so i'm not wasting my time on it. Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195 Reviewed-by: Qt Doc Bot <> Reviewed-by: Joerg Bornemann <>
Diffstat (limited to 'qmake/Makefile.win32')
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index b97dec863e..f560cf8cb1 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -38,7 +38,7 @@ CFLAGS_BARE = -c -Fo./ \
-I$(BUILD_PATH)\src\corelib\global -DHAVE_QCONFIG_CPP \
-I$(SOURCE_PATH)\tools\shared \
@@ -57,7 +57,9 @@ ADDCLEAN = vc60.pdb vc70.pdb qmake.pdb qmake.ilk
#qmake code
-OBJS = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \
+OBJS = project.obj main.obj ioutils.obj proitems.obj \
+ qmakeglobals.obj qmakeparser.obj qmakeevaluator.obj qmakebuiltins.obj \
+ makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \
option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \
makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \
@@ -164,6 +166,9 @@ $(QTOBJS): qmake_pch.obj
$(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP $(QMKSRC)\qmake_pch.h
+ $(CXX) $(CXXFLAGS) $<