Qdoc: put hardcoded url as workaround QTBUG-28500

[profile/ivi/qtbase.git] / qmake / Makefile.win32-g++

diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 8754e10..7bc24ed 100644 (file)
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -9,6 +9,7 @@ endif
 CORESRC = $(SOURCE_PATH)/src/corelib
 TOOLSRC = $(SOURCE_PATH)/tools
 QMKSRC = $(SOURCE_PATH)/qmake
+QMKLIBSRC = $(QMKSRC)/library
 
 # SHELL is the full path of sh.exe, unless
 # 1) it is found in the current directory
@@ -43,15 +44,15 @@ endif
 #
 CXX        =   g++
 CFLAGS     =   -c -o$@ -O \
-               -I$(QMKSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \
+               -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \
                -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
-               -I$(BUILD_PATH)/src/corelib/global \
+               -I$(BUILD_PATH)/src/corelib/global -DHAVE_QCONFIG_CPP \
                -I$(SOURCE_PATH)/mkspecs/win32-g++  \
                -I$(SOURCE_PATH)/tools/shared \
-               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT \
-               -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-               -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-               -DQT_BOOTSTRAPPED
+               -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL -DPROEVALUATOR_DEBUG \
+               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \
+               -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+               -DUNICODE
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS      = -static-libgcc -s
 LIBS       = -lole32 -luuid -ladvapi32 -lkernel32
@@ -60,11 +61,14 @@ ADDCLEAN    =
 
 
 #qmake code
-OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
+OBJS        = project.o main.o ioutils.o proitems.o \
+              qmakeglobals.o qmakeparser.o qmakeevaluator.o qmakebuiltins.o \
+              makefile.o unixmake.o unixmake2.o mingw_make.o \
               option.o winmakefile.o projectgenerator.o property.o meta.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
-              borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
-              msvc_objectmodel.o msbuild_objectmodel.o registry.o gbuild.o
+              msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
+              msvc_objectmodel.o msbuild_objectmodel.o registry.o gbuild.o \
+              cesdkhandler.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -74,6 +78,7 @@ endif
 QTOBJS= \
        qbitarray.o \
        qbuffer.o \
+       qarraydata.o \
        qbytearray.o \
        qcryptographichash.o \
        qvsnprintf.o \
@@ -116,7 +121,6 @@ QTOBJS= \
        qtextstream.o \
        quuid.o \
        qvector.o \
-       qurl.o \
        qsettings.o \
        qsettings_win.o \
        qvariant.o \
@@ -147,7 +151,7 @@ distclean:: clean
        $(CXX) $(CXXFLAGS) $<
 
 QTVPATH = $(TOOLSRC)/shared/windows:$(CORESRC)/global:$(CORESRC)/kernel:$(CORESRC)/tools:$(CORESRC)/codecs:$(CORESRC)/io:$(CORESRC)/xml:$(CORESRC)/plugin:$(BUILD_PATH)/src/corelib/global
-VPATH = $(QMKSRC):$(QMKSRC)/generators:$(QMKSRC)/generators/unix:$(QMKSRC)/generators/mac:$(QMKSRC)/generators/win32:$(QMKSRC)/generators/integrity:$(QTVPATH)
+VPATH = $(QMKSRC):$(QMKLIBSRC):$(QMKSRC)/generators:$(QMKSRC)/generators/unix:$(QMKSRC)/generators/mac:$(QMKSRC)/generators/win32:$(QMKSRC)/generators/integrity:$(QTVPATH)
 
 project.o: $(QMKSRC)/project.h $(QMKSRC)/option.h
 meta.o: $(QMKSRC)/project.h $(QMKSRC)/option.h