Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/qmake/Makefile.win32-g++

    r51 r561  
    1515CFLAGS      =   -c -o$@ -O \
    1616                -I. -Igenerators -Igenerators/unix \
    17                 -Igenerators/win32 -Igenerators/os2 -Igenerators/mac \
     17                -Igenerators/win32 -Igenerators/mac \
     18                -Igenerators/symbian -Igenerators/os2 \
    1819                -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
    1920                -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
    2021                -I$(BUILD_PATH)/src/corelib/global \
    21                 -I$(BUILD_PATH)/include/QtScript \
     22                -I$(BUILD_PATH)/src/corelib/xml \
    2223                -I$(SOURCE_PATH)/mkspecs/win32-g++  \
    2324                -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
    24                 -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
    25                 -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM
     25                -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
     26                -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
     27                -DQT_BOOTSTRAPPED
    2628CXXFLAGS    =   $(CFLAGS)
    2729LFLAGS      =
     
    3638              makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
    3739              borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
    38               msvc_objectmodel.o gnumake.o
     40              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
     41              symmake_abld.o symmake_sbsv2.o gnumake.o
    3942
    4043ifdef QMAKE_OPENSOURCE_EDITION
     
    4750        qbuffer.o \
    4851        qbytearray.o \
    49         qcryptographichash.o \
     52        qcryptographichash.o \
    5053        qvsnprintf.o \
    5154        qbytearraymatcher.o \
     
    6669        qiodevice.o \
    6770        qlibraryinfo.o \
    68         qlistdata.o \
     71        qlist.o \
    6972        qlinkedlist.o \
    7073        qlocale.o \
     
    7275        qmap.o \
    7376        qregexp.o \
     77        qtextcodec.o \
     78        qutfcodec.o \
    7479        qstring.o \
    7580        qstringlist.o \
     
    8287        qvariant.o \
    8388        qmetatype.o \
    84         qnumeric.o \
    85         qscriptasm.o \
    86         qscriptast.o \
    87         qscriptastvisitor.o \
    88         qscriptcompiler.o \
    89         qscriptecmaarray.o \
    90         qscriptecmaboolean.o \
    91         qscriptecmacore.o \
    92         qscriptecmadate.o \
    93         qscriptecmafunction.o \
    94         qscriptecmaglobal.o \
    95         qscriptecmamath.o \
    96         qscriptecmanumber.o \
    97         qscriptecmaobject.o \
    98         qscriptecmaregexp.o \
    99         qscriptecmastring.o \
    100         qscriptecmaerror.o \
    101         qscriptcontext_p.o \
    102         qscriptengine.o \
    103         qscriptengine_p.o \
    104         qscriptengineagent.o \
    105         qscriptextenumeration.o \
    106         qscriptextvariant.o \
    107         qscriptcontext.o \
    108         qscriptcontextinfo.o \
    109         qscriptfunction.o \
    110         qscriptgrammar.o \
    111         qscriptlexer.o \
    112         qscriptclassdata.o \
    113         qscriptparser.o \
    114         qscriptprettypretty.o \
    115         qscriptsyntaxchecker.o \
    116         qscriptclass.o \
    117         qscriptclasspropertyiterator.o \
    118         qscriptstring.o \
    119         qscriptvalue.o \
    120         qscriptvalueimpl.o \
    121         qscriptvalueiterator.o \
    122         qscriptvalueiteratorimpl.o
     89        qxmlstream.o \
     90        qxmlutils.o \
     91        qnumeric.o
    12392
    12493
     
    193162        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp
    194163
     164qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp
     165        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp
     166
    195167qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
    196168        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
     
    205177        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
    206178
    207 qlistdata.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
    208         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
     179qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
     180        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
    209181
    210182qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
     
    232204        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
    233205
    234 qtextcodec.o: $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
    235         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
     206qtextcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp
     207        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp
    236208
    237209qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
     
    295267        $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
    296268
     269symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
     270        $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
     271
     272symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
     273        $(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
     274
     275symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
     276        $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
     277
     278initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
     279        $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
     280
    297281gnumake.o: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
    298282        $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp
     
    328312        $(CXX) $(CXXFLAGS) generators/xmloutput.cpp
    329313
    330 qscriptasm.o: $(SOURCE_PATH)\src\script\qscriptasm.cpp
    331         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
    332 
    333 qscriptast.o: $(SOURCE_PATH)\src\script\qscriptast.cpp
    334         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
    335 
    336 qscriptastvisitor.o: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    337         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    338 
    339 qscriptcompiler.o: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    340         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    341 
    342 qscriptecmaarray.o: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    343         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    344 
    345 qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    346         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    347 
    348 qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    349         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    350 
    351 qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    352         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    353 
    354 qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    355         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    356 
    357 qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    358         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    359 
    360 qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    361         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    362 
    363 qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    364         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    365 
    366 qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    367         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    368 
    369 qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    370         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    371 
    372 qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    373         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    374 
    375 qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    376         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    377 
    378 qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    379         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    380 
    381 qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
    382         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
    383 
    384 qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    385         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    386 
    387 qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    388         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    389 
    390 qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    391         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    392 
    393 qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    394         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    395 
    396 qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    397         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    398 
    399 qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    400         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    401 
    402 qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    403         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    404 
    405 qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    406         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    407 
    408 qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    409         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    410 
    411 qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    412         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    413 
    414 qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
    415         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
    416 
    417 qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    418         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    419 
    420 qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    421         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    422 
    423 qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
    424         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
    425 
    426 qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    427         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    428 
    429 qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
    430         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
    431 
    432 qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    433         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    434 
    435 qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    436         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    437 
    438 qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    439         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    440 
    441 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
    442         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
     314qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     315        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     316
     317qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
     318        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
Note: See TracChangeset for help on using the changeset viewer.