Ignore:
Timestamp:
Feb 10, 2010, 12:52:55 AM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.1 from Nokia.

Location:
branches/vendor/nokia/qt/current/qmake
Files:
10 added
46 edited

Legend:

Unmodified
Added
Removed

  • branches/vendor/nokia/qt/current/qmake/Makefile.unix

    r2 r556  
    1010     mingw_make.o option.o winmakefile.o projectgenerator.o \
    1111     meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
    12      borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o
     12     borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
     13     symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o
    1314
    1415#qt code
    15 QOBJS=qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
    16       qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlistdata.o qfile.o \
     16QOBJS=qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
     17      qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfile.o \
    1718      qfsfileengine_unix.o qfsfileengine_iterator_unix.o qfsfileengine.o \
    1819      qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \
    1920      qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \
    2021      qmap.o qmetatype.o qsettings.o qlibraryinfo.o qvariant.o qvsnprintf.o \
    21       qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o \
    22       qscriptasm.o qscriptast.o qscriptastvisitor.o \
    23       qscriptcompiler.o qscriptecmaarray.o qscriptecmaboolean.o \
    24       qscriptecmacore.o qscriptecmadate.o qscriptecmafunction.o \
    25       qscriptecmaglobal.o qscriptecmamath.o qscriptecmanumber.o \
    26       qscriptecmaobject.o qscriptecmaregexp.o qscriptecmastring.o \
    27       qscriptecmaerror.o qscriptcontext_p.o qscriptengine.o \
    28       qscriptengine_p.o qscriptextenumeration.o qscriptextvariant.o \
    29       qscriptcontext.o qscriptfunction.o \
    30       qscriptgrammar.o qscriptlexer.o qscriptclassdata.o \
    31       qscriptparser.o qscriptprettypretty.o qscriptsyntaxchecker.o \
    32       qscriptvalue.o qscriptvalueimpl.o qscriptvalueiterator.o \
    33       qscriptvalueiteratorimpl.o \
    34       qscriptclass.o qscriptclasspropertyiterator.o \
    35       qscriptengineagent.o qscriptcontextinfo.o qscriptstring.o \
     22      qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o qxmlstream.o qxmlutils.o \
    3623      $(QTOBJS)
    3724
    … …  
    4532           generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
    4633           generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
     34
     35
     36
    4737           $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
    4838           $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
    … …  
    5343           $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \
    5444           $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \
    55            $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp \
     45           $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \
    5646           $(SOURCE_PATH)/src/corelib/tools/qvector.cpp $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
    5747           $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \
    … …  
    6656           $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
    6757           $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \
    68            $(SOURCE_PATH)/src/script/qscriptasm.cpp \
    69            $(SOURCE_PATH)/src/script/qscriptast.cpp $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp \
    70            $(SOURCE_PATH)/src/script/qscriptcompiler.cpp $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp \
    71            $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp $(SOURCE_PATH)/src/script/qscriptecmacore.cpp \
    72            $(SOURCE_PATH)/src/script/qscriptecmadate.cpp $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp \
    73            $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp $(SOURCE_PATH)/src/script/qscriptecmamath.cpp \
    74            $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp \
    75            $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp $(SOURCE_PATH)/src/script/qscriptecmastring.cpp \
    76            $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp \
    77            $(SOURCE_PATH)/src/script/qscriptengine.cpp $(SOURCE_PATH)/src/script/qscriptengine_p.cpp \
    78            $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp $(SOURCE_PATH)/src/script/qscriptextvariant.cpp \
    79            $(SOURCE_PATH)/src/script/qscriptcontext.cpp $(SOURCE_PATH)/src/script/qscriptfunction.cpp \
    80            $(SOURCE_PATH)/src/script/qscriptgrammar.cpp \
    81            $(SOURCE_PATH)/src/script/qscriptlexer.cpp $(SOURCE_PATH)/src/script/qscriptclassdata.cpp \
    82            $(SOURCE_PATH)/src/script/qscriptparser.cpp $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp \
    83            $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp \
    84            $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
    85            $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp \
    86            $(SOURCE_PATH)/src/script/qscriptclass.cpp $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp \
    87            $(SOURCE_PATH)/src/script/qscriptengineagent.cpp $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp \
    88            $(SOURCE_PATH)/src/script/qscriptstring.cpp \
     58           $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \
     59           $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
    8960           $(QTSRCS)
    9061
    91 CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
     62CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
    9263           -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
    93            -I$(BUILD_PATH)/src/corelib/global \
    94            -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
     64           -I$(BUILD_PATH)/src/corelib/global \
     65           -DQT_NO_PCRE \
    9566           -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
    9667           -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
    … …  
    161132        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp
    162133
     134
     135
     136
     137
     138
     139
    163140qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
    164141        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
    … …  
    173150        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
    174151
    175 qlistdata.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
    176         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
     152qlist.cpp
     153        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
    177154
    178155qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
    … …  
    293270        $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp
    294271
     272
     273
     274
     275
     276
     277
     278
     279
     280
     281
     282
     283
    295284projectgenerator.o: generators/projectgenerator.cpp
    296285        $(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp
    297286
    298 qscriptasm.o: $(SOURCE_PATH)/src/script/qscriptasm.cpp
    299         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptasm.cpp
    300 
    301 qscriptast.o: $(SOURCE_PATH)/src/script/qscriptast.cpp
    302         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptast.cpp
    303 
    304 qscriptastvisitor.o: $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp
    305         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp
    306 
    307 qscriptcompiler.o: $(SOURCE_PATH)/src/script/qscriptcompiler.cpp
    308         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcompiler.cpp
    309 
    310 qscriptecmaarray.o: $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp
    311         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp
    312 
    313 qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    314         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    315 
    316 qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    317         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    318 
    319 qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    320         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    321 
    322 qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    323         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    324 
    325 qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    326         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    327 
    328 qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    329         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    330 
    331 qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    332         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    333 
    334 qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    335         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    336 
    337 qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    338         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    339 
    340 qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    341         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    342 
    343 qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    344         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    345 
    346 qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    347         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    348 
    349 qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
    350         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
    351 
    352 qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    353         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    354 
    355 qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    356         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    357 
    358 qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    359         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    360 
    361 qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    362         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    363 
    364 qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    365         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    366 
    367 qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    368         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    369 
    370 qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    371         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    372 
    373 qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    374         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    375 
    376 qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
    377         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
    378 
    379 qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    380         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    381 
    382 qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    383         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    384 
    385 qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    386         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    387 
    388 qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    389         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    390 
    391 qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    392         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    393 
    394 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
    395         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
    396 
    397 qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
    398         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
    399 
    400 qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    401         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    402 
    403 qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    404         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    405 
    406 qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    407         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    408 
    409 qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
    410         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
    411 
     287qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     288        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     289
     290qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
     291        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
    412292#default rules
    413293.cpp.o:

  • branches/vendor/nokia/qt/current/qmake/Makefile.win32

    r2 r556  
    2929CFLAGS       = -c -Fo$@ \
    3030              -W3 -nologo -O2 \
    31               -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
     31              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
    3232              -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
    3333              -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
    3434              -I$(BUILD_PATH)\src\corelib\global \
    35               -I$(BUILD_PATH)\include\QtScript \
     35              -I$(BUILD_PATH)\ \
    3636              -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
    3737              -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
    … …  
    4242LFLAGS      =
    4343LIBS        = ole32.lib advapi32.lib
    44 LINKQMAKE   = $(LINK) $(LFLAGS) -DEBUG -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
     44LINKQMAKE   = $(LINK) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
    4545ADDCLEAN    = vc60.pdb vc70.pdb qmake.pdb qmake.ilk
    4646!ELSE
    … …  
    5555CFLAGS      = -c -o$@ \
    5656        -tWR -w -w-hid -w-use -O1 \
    57         -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
     57        -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
    5858        -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
    5959        -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
    … …  
    7575              makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
    7676              borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \
    77               msvc_objectmodel.obj
     77              msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
     78              symmake_abld.obj symmake_sbsv2.obj
    7879
    7980!IFDEF QMAKE_OPENSOURCE_EDITION
    … …  
    8586        qbitarray.obj \
    8687        qbuffer.obj \
    87         qcryptographichash.obj \
     88qcryptographichash.obj \
    8889        qfsfileengine.obj \
    8990        qfsfileengine_iterator.obj \
    9091        qbytearray.obj \
    91         qvsnprintf.obj \
     92qvsnprintf.obj \
    9293        qbytearraymatcher.obj \
    9394        qdatetime.obj \
    … …  
    103104        qhash.obj \
    104105        qiodevice.obj \
    105         qlistdata.obj \
     106        qlist.obj \
    106107        qlinkedlist.obj \
    107108        qlocale.obj \
    108         qmalloc.obj \
     109qmalloc.obj \
    109110        qmap.obj \
    110111        qregexp.obj \
     112
     113
    111114        qstring.obj \
    112115        qstringlist.obj \
    … …  
    118121        qlibraryinfo.obj \
    119122        qvariant.obj \
    120         qurl.obj \
     123qurl.obj \
    121124        qsettings_win.obj \
    122         qmetatype.obj \
    123         qnumeric.obj \
    124         qscriptasm.obj \
    125         qscriptast.obj \
    126         qscriptastvisitor.obj \
    127         qscriptcompiler.obj \
    128         qscriptecmaarray.obj \
    129         qscriptecmaboolean.obj \
    130         qscriptecmacore.obj \
    131         qscriptecmadate.obj \
    132         qscriptecmafunction.obj \
    133         qscriptecmaglobal.obj \
    134         qscriptecmamath.obj \
    135         qscriptecmanumber.obj \
    136         qscriptecmaobject.obj \
    137         qscriptecmaregexp.obj \
    138         qscriptecmastring.obj \
    139         qscriptecmaerror.obj \
    140         qscriptcontext_p.obj \
    141         qscriptengine.obj \
    142         qscriptengine_p.obj \
    143         qscriptengineagent.obj \
    144         qscriptextenumeration.obj \
    145         qscriptextvariant.obj \
    146         qscriptcontext.obj \
    147         qscriptcontextinfo.obj \
    148         qscriptfunction.obj \
    149         qscriptgrammar.obj \
    150         qscriptlexer.obj \
    151         qscriptclassdata.obj \
    152         qscriptparser.obj \
    153         qscriptprettypretty.obj \
    154         qscriptsyntaxchecker.obj \
    155         qscriptclass.obj \
    156         qscriptclasspropertyiterator.obj \
    157         qscriptstring.obj \
    158         qscriptvalue.obj \
    159         qscriptvalueimpl.obj \
    160         qscriptvalueiterator.obj \
    161         qscriptvalueiteratorimpl.obj
     125        qmetatype.obj \
     126        qxmlstream.obj \
     127        qxmlutils.obj \
     128        qnumeric.obj
    162129
    163130
    … …  
    176143        -del qfsfileengine_iterator.obj
    177144        -del qbytearray.obj
    178         -del qvsnprintf.obj
     145-del qvsnprintf.obj
    179146        -del qbytearraymatcher.obj
    180147        -del qdatetime.obj
    … …  
    190157        -del qhash.obj
    191158        -del qiodevice.obj
    192         -del qlistdata.obj
     159        -del qlist.obj
    193160        -del qlocale.obj
    194161        -del qmalloc.obj
    195162        -del qmap.obj
    196163        -del qregexp.obj
     164
     165
    197166        -del qstring.obj
    198167        -del qstringlist.obj
    … …  
    204173        -del qlibraryinfo.obj
    205174        -del qvariant.obj
    206         -del qurl.obj
     175-del qurl.obj
    207176        -del qsettings_win.obj
    208         -del qmetatype.obj
     177-del qmetatype.obj
    209178        -del project.obj
    210179        -del main.obj
    … …  
    226195        -del msvc_vcproj.obj
    227196        -del msvc_objectmodel.obj
     197
     198
     199
     200
    228201        -del pbuilder_pbx.obj
    229         -del qnumeric.obj \
    230         -del qscriptasm.obj \
    231         -del qscriptast.obj \
    232         -del qscriptastvisitor.obj \
    233         -del qscriptcompiler.obj \
    234         -del qscriptecmaarray.obj \
    235         -del qscriptecmaboolean.obj \
    236         -del qscriptecmacore.obj \
    237         -del qscriptecmadate.obj \
    238         -del qscriptecmafunction.obj \
    239         -del qscriptecmaglobal.obj \
    240         -del qscriptecmamath.obj \
    241         -del qscriptecmanumber.obj \
    242         -del qscriptecmaobject.obj \
    243         -del qscriptecmaregexp.obj \
    244         -del qscriptecmastring.obj \
    245         -del qscriptecmaerror.obj \
    246         -del qscriptcontext_p.obj \
    247         -del qscriptengine.obj \
    248         -del qscriptengine_p.obj \
    249         -del qscriptengineagent.obj \
    250         -del qscriptextenumeration.obj \
    251         -del qscriptextvariant.obj \
    252         -del qscriptcontext.obj \
    253         -del qscriptcontextinfo.obj \
    254         -del qscriptfunction.obj \
    255         -del qscriptgrammar.obj \
    256         -del qscriptlexer.obj \
    257         -del qscriptclassdata.obj \
    258         -del qscriptparser.obj \
    259         -del qscriptprettypretty.obj \
    260         -del qscriptsyntaxchecker.obj \
    261         -del qscriptclass.obj \
    262         -del qscriptclasspropertyiterator.obj \
    263         -del qscriptstring.obj \
    264         -del qscriptvalue.obj \
    265         -del qscriptvalueimpl.obj \
    266         -del qscriptvalueiterator.obj \
    267         -del qscriptvalueiteratorimpl.obj
     202        -del qxmlstream.obj
     203        -del qxmlutils.obj
     204        -del qnumeric.obj
    268205        -del vc60.pdb
    269206        -del vc70.pdb
    … …  
    338275        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qchar.cpp
    339276
     277
     278
     279
    340280qstring.obj: $(SOURCE_PATH)\src\corelib\tools\qstring.cpp
    341281        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstring.cpp
    … …  
    353293        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp
    354294
    355 qlistdata.obj: $(SOURCE_PATH)\src\corelib\tools\qlistdata.cpp
    356         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlistdata.cpp
     295qlist.cpp
     296        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlist.cpp
    357297
    358298qlinkedlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp
    … …  
    380320        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp
    381321
    382 qtextcodec.obj: $(SOURCE_PATH)\src\codecs\qtextcodec.cpp
    383         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\codecs\qtextcodec.cpp
     322qtextcodec.obj: $(SOURCE_PATH)\src\codecs\qtextcodec.cpp
     323        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\codecs\qtextcodec.cpp
    384324
    385325qregexp.obj: $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp
    … …  
    415355qunicodetables.obj: $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
    416356        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
     357
    417358makefile.obj: $(SOURCE_PATH)/qmake/generators\makefile.cpp
    418359        $(CXX) $(CXXFLAGS) generators\makefile.cpp
    … …  
    445386        $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
    446387
     388
     389
     390
     391
     392
     393
     394
     395
     396
     397
     398
     399
    447400md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
    448401        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
     402
    449403project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
    450404        $(CXX) $(CXXFLAGS) project.cpp
    … …  
    477431        $(CXX) $(CXXFLAGS) generators/xmloutput.cpp
    478432
    479 qscriptasm.obj: $(SOURCE_PATH)\src\script\qscriptasm.cpp
    480         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
    481 
    482 qscriptast.obj: $(SOURCE_PATH)\src\script\qscriptast.cpp
    483         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
    484 
    485 qscriptastvisitor.obj: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    486         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    487 
    488 qscriptcompiler.obj: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    489         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    490 
    491 qscriptecmaarray.obj: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    492         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    493 
    494 qscriptecmaboolean.obj: $(SOURCE_PATH)\src\script\qscriptecmaboolean.cpp
    495         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaboolean.cpp
    496 
    497 qscriptecmacore.obj: $(SOURCE_PATH)\src\script\qscriptecmacore.cpp
    498         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmacore.cpp
    499 
    500 qscriptecmadate.obj: $(SOURCE_PATH)\src\script\qscriptecmadate.cpp
    501         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmadate.cpp
    502 
    503 qscriptecmafunction.obj: $(SOURCE_PATH)\src\script\qscriptecmafunction.cpp
    504         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmafunction.cpp
    505 
    506 qscriptecmaglobal.obj: $(SOURCE_PATH)\src\script\qscriptecmaglobal.cpp
    507         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaglobal.cpp
    508 
    509 qscriptecmamath.obj: $(SOURCE_PATH)\src\script\qscriptecmamath.cpp
    510         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmamath.cpp
    511 
    512 qscriptecmanumber.obj: $(SOURCE_PATH)\src\script\qscriptecmanumber.cpp
    513         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmanumber.cpp
    514 
    515 qscriptecmaobject.obj: $(SOURCE_PATH)\src\script\qscriptecmaobject.cpp
    516         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaobject.cpp
    517 
    518 qscriptecmaregexp.obj: $(SOURCE_PATH)\src\script\qscriptecmaregexp.cpp
    519         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaregexp.cpp
    520 
    521 qscriptecmastring.obj: $(SOURCE_PATH)\src\script\qscriptecmastring.cpp
    522         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmastring.cpp
    523 
    524 qscriptecmaerror.obj: $(SOURCE_PATH)\src\script\qscriptecmaerror.cpp
    525         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaerror.cpp
    526 
    527 qscriptcontext_p.obj: $(SOURCE_PATH)\src\script\qscriptcontext_p.cpp
    528         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcontext_p.cpp
    529 
    530 qscriptengine.obj: $(SOURCE_PATH)\src\script\qscriptengine.cpp
    531         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptengine.cpp
    532 
    533 qscriptengine_p.obj: $(SOURCE_PATH)\src\script\qscriptengine_p.cpp
    534         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptengine_p.cpp
    535 
    536 qscriptengineagent.obj: $(SOURCE_PATH)\src\script\qscriptengineagent.cpp
    537         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptengineagent.cpp
    538 
    539 qscriptextenumeration.obj: $(SOURCE_PATH)\src\script\qscriptextenumeration.cpp
    540         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptextenumeration.cpp
    541 
    542 qscriptextvariant.obj: $(SOURCE_PATH)\src\script\qscriptextvariant.cpp
    543         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptextvariant.cpp
    544 
    545 qscriptcontext.obj: $(SOURCE_PATH)\src\script\qscriptcontext.cpp
    546         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcontext.cpp
    547 
    548 qscriptcontextinfo.obj: $(SOURCE_PATH)\src\script\qscriptcontextinfo.cpp
    549         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcontextinfo.cpp
    550 
    551 qscriptfunction.obj: $(SOURCE_PATH)\src\script\qscriptfunction.cpp
    552         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptfunction.cpp
    553 
    554 qscriptgrammar.obj: $(SOURCE_PATH)\src\script\qscriptgrammar.cpp
    555         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptgrammar.cpp
    556 
    557 qscriptlexer.obj: $(SOURCE_PATH)\src\script\qscriptlexer.cpp
    558         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptlexer.cpp
    559 
    560 qscriptclassdata.obj: $(SOURCE_PATH)\src\script\qscriptclassdata.cpp
    561         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptclassdata.cpp
    562 
    563 qscriptparser.obj: $(SOURCE_PATH)\src\script\qscriptparser.cpp
    564         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptparser.cpp
    565 
    566 qscriptprettypretty.obj: $(SOURCE_PATH)\src\script\qscriptprettypretty.cpp
    567         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptprettypretty.cpp
    568 
    569 qscriptsyntaxchecker.obj: $(SOURCE_PATH)\src\script\qscriptsyntaxchecker.cpp
    570         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptsyntaxchecker.cpp
    571 
    572 qscriptstring.obj: $(SOURCE_PATH)\src\script\qscriptstring.cpp
    573         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptstring.cpp
    574 
    575 qscriptclass.obj: $(SOURCE_PATH)\src\script\qscriptclass.cpp
    576         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptclass.cpp
    577 
    578 qscriptclasspropertyiterator.obj: $(SOURCE_PATH)\src\script\qscriptclasspropertyiterator.cpp
    579         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptclasspropertyiterator.cpp
    580 
    581 qscriptvalue.obj: $(SOURCE_PATH)\src\script\qscriptvalue.cpp
    582         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalue.cpp
    583 
    584 qscriptvalueimpl.obj: $(SOURCE_PATH)\src\script\qscriptvalueimpl.cpp
    585         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueimpl.cpp
    586 
    587 qscriptvalueiterator.obj: $(SOURCE_PATH)\src\script\qscriptvalueiterator.cpp
    588         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueiterator.cpp
    589 
    590 qscriptvalueiteratorimpl.obj: $(SOURCE_PATH)\src\script\qscriptvalueiteratorimpl.cpp
    591         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueiteratorimpl.cpp
     433qxmlstream.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
     434        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
     435
     436qxmlutils.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
     437        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp

  • branches/vendor/nokia/qt/current/qmake/Makefile.win32-g++

    r2 r556  
    1616                -I. -Igenerators -Igenerators/unix \
    1717                -Igenerators/win32 -Igenerators/mac \
     18
    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        \
    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
     40              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
     41              symmake_abld.o symmake_sbsv2.o
    3942
    4043ifdef QMAKE_OPENSOURCE_EDITION
    … …  
    4750        qbuffer.o \
    4851        qbytearray.o \
    49         qcryptographichash.o \
     52qcryptographichash.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
     78
    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
     164
     165
     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.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/codecs/qtextcodec.cpp
     207        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
    236208
    237209qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
    … …  
    295267        $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
    296268
     269
     270
     271
     272
     273
     274
     275
     276
     277
     278
     279
     280
    297281project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
    298282        $(CXX) $(CXXFLAGS) project.cpp
    … …  
    325309        $(CXX) $(CXXFLAGS) generators/xmloutput.cpp
    326310
    327 qscriptasm.o: $(SOURCE_PATH)\src\script\qscriptasm.cpp
    328         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
    329 
    330 qscriptast.o: $(SOURCE_PATH)\src\script\qscriptast.cpp
    331         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
    332 
    333 qscriptastvisitor.o: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    334         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    335 
    336 qscriptcompiler.o: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    337         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    338 
    339 qscriptecmaarray.o: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    340         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    341 
    342 qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    343         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    344 
    345 qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    346         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    347 
    348 qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    349         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    350 
    351 qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    352         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    353 
    354 qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    355         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    356 
    357 qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    358         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    359 
    360 qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    361         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    362 
    363 qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    364         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    365 
    366 qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    367         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    368 
    369 qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    370         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    371 
    372 qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    373         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    374 
    375 qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    376         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    377 
    378 qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
    379         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
    380 
    381 qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    382         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    383 
    384 qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    385         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    386 
    387 qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    388         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    389 
    390 qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    391         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    392 
    393 qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    394         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    395 
    396 qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    397         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    398 
    399 qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    400         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    401 
    402 qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    403         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    404 
    405 qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    406         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    407 
    408 qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    409         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    410 
    411 qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
    412         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
    413 
    414 qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    415         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    416 
    417 qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    418         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    419 
    420 qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
    421         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
    422 
    423 qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    424         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    425 
    426 qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
    427         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
    428 
    429 qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    430         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    431 
    432 qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    433         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    434 
    435 qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    436         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    437 
    438 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
    439         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
     311qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     312        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     313
     314qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
     315        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp

  • branches/vendor/nokia/qt/current/qmake/Makefile.win32-g++-sh

    r2 r556  
    1616                -I. -Igenerators -Igenerators/unix \
    1717                -Igenerators/win32 -Igenerators/mac \
     18
    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        \
    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
     40              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
     41              symmake_abld.o symmake_sbsv2.o
    3942
    4043ifdef QMAKE_OPENSOURCE_EDITION
    … …  
    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
     78
    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
    12493qmake.exe: $(OBJS) $(QTOBJS)
    … …  
    192161        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp
    193162
     163
     164
     165
    194166qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
    195167        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
    … …  
    204176        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
    205177
    206 qlistdata.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
    207         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
     178qlist.cpp
     179        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
    208180
    209181qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
    … …  
    231203        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
    232204
    233 qtextcodec.o: $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
    234         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
     205qtextcodec.o: $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
     206        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
    235207
    236208qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
    … …  
    294266        $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
    295267
     268
     269
     270
     271
     272
     273
     274
     275
     276
     277
     278
     279
    296280project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
    297281        $(CXX) $(CXXFLAGS) project.cpp
    … …  
    324308        $(CXX) $(CXXFLAGS) generators/xmloutput.cpp
    325309
    326 qscriptasm.o: $(SOURCE_PATH)\src\script\qscriptasm.cpp
    327         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
    328 
    329 qscriptast.o: $(SOURCE_PATH)\src\script\qscriptast.cpp
    330         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
    331 
    332 qscriptastvisitor.o: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    333         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
    334 
    335 qscriptcompiler.o: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    336         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
    337 
    338 qscriptecmaarray.o: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    339         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
    340 
    341 qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    342         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
    343 
    344 qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    345         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
    346 
    347 qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    348         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
    349 
    350 qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    351         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
    352 
    353 qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    354         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
    355 
    356 qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    357         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
    358 
    359 qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    360         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
    361 
    362 qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    363         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
    364 
    365 qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    366         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
    367 
    368 qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    369         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
    370 
    371 qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    372         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
    373 
    374 qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    375         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
    376 
    377 qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
    378         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
    379 
    380 qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    381         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
    382 
    383 qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    384         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
    385 
    386 qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    387         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
    388 
    389 qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    390         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
    391 
    392 qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    393         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
    394 
    395 qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    396         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
    397 
    398 qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    399         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
    400 
    401 qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    402         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
    403 
    404 qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    405         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
    406 
    407 qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    408         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
    409 
    410 qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
    411         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
    412 
    413 qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    414         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
    415 
    416 qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    417         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
    418 
    419 qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
    420         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
    421 
    422 qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    423         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
    424 
    425 qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
    426         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
    427 
    428 qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    429         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
    430 
    431 qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    432         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
    433 
    434 qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    435         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
    436 
    437 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
    438         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
     310qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     311        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
     312
     313qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
     314        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp

  • branches/vendor/nokia/qt/current/qmake/cachekeys.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/mac/pbuilder_pbx.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    157157                    if(!profile.endsWith(Option::dir_sep))
    158158                        profile += Option::dir_sep;
    159                     profile += fi.baseName() + ".pro";
     159                    profile += fi.baseName() + ;
    160160                    fi = QFileInfo(profile);
    161161                }

  • branches/vendor/nokia/qt/current/qmake/generators/mac/pbuilder_pbx.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/makefile.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    122122    if(path.startsWith(QDir::separator())) {
    123123        d.cd(QString(QDir::separator()));
    124         path = path.right(path.length() - 1);
     124        path 1);
    125125    }
    126126    bool ret = true;
    … …  
    130130        if(QFile::exists(path.left(3))) {
    131131            d.cd(path.left(3));
    132             path = path.right(path.length() - 3);
     132            path 3);
    133133        } else {
    134134            warn_msg(WarnLogic, "Cannot access drive '%s' (%s)",
    … …  
    202202           v.contains("QMAKE_ABSOLUTE_SOURCE_ROOT")) {
    203203            QString root = v["QMAKE_ABSOLUTE_SOURCE_ROOT"].first();
    204             root = Option::fixPathToTargetOS(root);
     204            root = (root);
    205205            if(!root.isEmpty()) {
    206206                QFileInfo fi = fileInfo(Option::mkfile::cachefile);
    … …  
    208208                    QString cache_r = fi.path(), pwd = Option::output_dir;
    209209                    if(pwd.startsWith(cache_r) && !pwd.startsWith(root)) {
    210                         pwd = Option::fixPathToTargetOS(root + pwd.mid(cache_r.length()));
     210                        pwd = ));
    211211                        if(exists(pwd))
    212212                            v.insert("QMAKE_ABSOLUTE_SOURCE_PATH", QStringList(pwd));
    … …  
    218218    if(!v["QMAKE_ABSOLUTE_SOURCE_PATH"].isEmpty()) {
    219219        QString &asp = v["QMAKE_ABSOLUTE_SOURCE_PATH"].first();
    220         asp = Option::fixPathToTargetOS(asp);
     220        asp = (asp);
    221221        if(asp.isEmpty() || asp == Option::output_dir) //if they're the same, why bother?
    222222            v["QMAKE_ABSOLUTE_SOURCE_PATH"].clear();
    … …  
    244244#endif
    245245        {
    246             if(pathRef.right(Option::dir_sep.length()) != Option::dir_sep)
     246            if()
    247247                pathRef += Option::dir_sep;
    248248        }
    … …  
    276276                if(slash != -1) {
    277277                    path = path.left(slash);
    278                     if(path != "." &&
    279                        !mkdir(fileFixify(path, qmake_getpwd(), Option::output_dir)))
    280                         warn_msg(WarnLogic, "%s: Cannot access directory '%s'",
    281                                  (*it).toLatin1().constData(), path.toLatin1().constData());
     278                    // Make out path only if it does not contain makefile variables
     279                    if(!path.contains("${"))
     280                        if(path != "." &&
     281                           !mkdir(fileFixify(path, qmake_getpwd(), Option::output_dir)))
     282                            warn_msg(WarnLogic, "%s: Cannot access directory '%s'",
     283                                     (*it).toLatin1().constData(), path.toLatin1().constData());
    282284                }
    283285            }
    … …  
    290292            v.remove("DESTDIR");
    291293    }
    292     QDir::current().cd(currentDir);
    293294}
    294295
    … …  
    346347                    if(exists(real_dir + QDir::separator() + val)) {
    347348                        QString dir = (*vpath_it);
    348                         if(dir.right(Option::dir_sep.length()) != Option::dir_sep)
     349                        if()
    349350                            dir += Option::dir_sep;
    350351                        val = dir + val;
    … …  
    365366                    if(!(flags & VPATH_NoFixify))
    366367                        real_dir = fileFixify(real_dir, qmake_getpwd(), Option::output_dir);
    367                     regex = regex.right(regex.length() - dir.length());
     368                    regex dir.length());
    368369                }
    369370                if(real_dir.isEmpty() || exists(real_dir)) {
    … …  
    725726            QString cache_file;
    726727            if(!project->isEmpty("QMAKE_INTERNAL_CACHE_FILE")) {
    727                 cache_file = Option::fixPathToLocalOS(project->first("QMAKE_INTERNAL_CACHE_FILE"));
     728                cache_file = (project->first("QMAKE_INTERNAL_CACHE_FILE"));
    728729            } else {
    729730                cache_file = ".qmake.internal.cache";
    … …  
    731732                    cache_file += ".BUILD." + project->first("BUILD_PASS");
    732733            }
    733             if(cache_file.indexOf(QDir::separator()) == -1)
    734                 cache_file.prepend(Option::output_dir + QDir::separator());
     734            if(cache_file.indexOf() == -1)
     735                cache_file.prepend(Option::output_dir + );
    735736            QMakeSourceFileInfo::setCacheFile(cache_file);
    736737        }
    … …  
    789790                        if(regex.lastIndexOf(Option::dir_sep) != -1) {
    790791                            dir = regex.left(regex.lastIndexOf(Option::dir_sep) + 1);
    791                             regex = regex.right(regex.length() - dir.length());
     792                            regex dir.length());
    792793                        }
    793794                        QStringList files = QDir(dir).entryList(QStringList(regex));
    … …  
    939940    int slsh = target.lastIndexOf(Option::dir_sep);
    940941    if(slsh != -1)
    941         target = target.right(target.length() - slsh - 1);
     942        target 1);
    942943    QString bdir = Option::output_dir;
    943944    if(bdir.isEmpty())
    … …  
    969970        else
    970971            libs << "QMAKE_LIBS"; //obvious one
     972
     973
    971974        t << "QMAKE_PRL_LIBS = ";
    972975        for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
    … …  
    10571060    int slsh = ret.lastIndexOf(Option::dir_sep);
    10581061    if(slsh != -1)
    1059         ret = ret.right(ret.length() - slsh);
     1062        ret slsh);
    10601063    if(!ret.endsWith(Option::prl_ext)) {
    10611064        int dot = ret.indexOf('.');
    10621065        if(dot != -1)
    1063             ret = ret.left(dot);
     1066            ret(dot);
    10641067        ret += Option::prl_ext;
    10651068    }
    … …  
    12111214           project->values((*it) + ".CONFIG").indexOf("dummy_install") == -1) {
    12121215            dst = fileFixify(unescapeFilePath(project->values(pvar).first()), FileFixifyAbsolute, false);
    1213             if(dst.right(1) != Option::dir_sep)
     1216            if()
    12141217                dst += Option::dir_sep;
    12151218        }
    … …  
    12401243                if(slsh != -1) {
    12411244                    dirstr = filestr.left(slsh+1);
    1242                     filestr = filestr.right(filestr.length() - slsh - 1);
    1243                 }
    1244                 if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
     1245                    filestr1);
     1246                }
     1247                if()
    12451248                    dirstr += Option::dir_sep;
    12461249                if(exists(wild)) { //real file
    … …  
    13421345            for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
    13431346                QString tmp_dst = fileFixify((*pit), FileFixifyAbsolute, false);
    1344                 if (!isWindowsShell() && tmp_dst.right(1) != Option::dir_sep)
     1347                if (!isWindowsShell() && )
    13451348                    tmp_dst += Option::dir_sep;
    13461349                t << mkdir_p_asstring(filePrefixRoot(root, tmp_dst)) << "\n\t";
    … …  
    14931496        }
    14941497        if(val.isEmpty() && var.startsWith(QLatin1String("QMAKE_VAR_FIRST_"))) {
    1495             const QString varname = var.mid(12);
     1498            const QString varname = var.mid(1);
    14961499            val += project->first(varname);
    14971500        }
    … …  
    15811584        if(!file.isNull()) {
    15821585            QMakeSourceFileInfo::addSourceFile(file, QMakeSourceFileInfo::SEEK_MOCS);
    1583             if(!mocable(file))
     1586            if(!mocable(file))
    15841587                return false;
     1588
     1589
     1590
    15851591        }
    15861592    } else if(project->values(comp + ".CONFIG").indexOf("function_verify") != -1) {
    … …  
    16991705            t << "\n\t" << cmd;
    17001706        t << endl << endl;
     1707
     1708
     1709
     1710
    17011711    }
    17021712}
    … …  
    17861796            if(tmp_clean.indexOf("${QMAKE_") == -1) {
    17871797                t << "\n\t" << "-$(DEL_FILE) " << tmp_clean;
     1798
     1799
    17881800                wrote_clean = true;
    17891801            }
    … …  
    18141826                }
    18151827                if(!cleans.isEmpty())
    1816                     t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, "");
     1828                    if (isForSymbian())
     1829                        t << valGlue(cleans, "\n\t" + del_statement, " 2> NUL\n\t" + del_statement, " 2> NUL");
     1830                    else
     1831                        t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, "");
    18171832                if(!wrote_clean_cmds) {
    18181833                    for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
    … …  
    18891904                continue;
    18901905
    1891             QString cmd = replaceExtraCompilerVariables(tmp_cmd, escapeFilePaths(inputs), QStringList(tmp_out));
     1906            QString cmd;
     1907            if (isForSymbianSbsv2()) {
     1908                // In sbsv2 the command inputs and outputs need to use absolute paths
     1909                cmd = replaceExtraCompilerVariables(tmp_cmd,
     1910                    fileFixify(escapeFilePaths(inputs), FileFixifyAbsolute),
     1911                    fileFixify(QStringList(tmp_out), FileFixifyAbsolute));
     1912            } else {
     1913                cmd = replaceExtraCompilerVariables(tmp_cmd, escapeFilePaths(inputs), QStringList(tmp_out));
     1914            }
     1915
    18921916            t << escapeDependencyPath(tmp_out) << ":";
     1917
    18931918            // compiler.CONFIG+=explicit_dependencies means that ONLY compiler.depends gets to cause Makefile dependencies
    18941919            if(project->values((*it) + ".CONFIG").indexOf("explicit_dependencies") != -1) {
    18951920                t << " " << valList(escapeDependencyPaths(fileFixify(tmp_dep, Option::output_dir, Option::output_dir)));
     1921
    18961922            } else {
    18971923                t << " " << valList(escapeDependencyPaths(inputs)) << " " << valList(escapeDependencyPaths(deps));
     1924
    18981925            }
    18991926            t << "\n\t" << cmd << endl << endl;
     1927
    19001928            continue;
    19011929        }
    … …  
    19111939            }
    19121940            QString cmd = replaceExtraCompilerVariables(tmp_cmd, (*input), out);
     1941
     1942
     1943
     1944
     1945
     1946
     1947
     1948
     1949
    19131950            for(QStringList::ConstIterator it3 = vars.constBegin(); it3 != vars.constEnd(); ++it3)
    19141951                cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
    … …  
    20002037            t << escapeDependencyPath(out) << ": " << valList(escapeDependencyPaths(deps)) << "\n\t"
    20012038              << cmd << endl << endl;
     2039
     2040
     2041
    20022042        }
    20032043    }
    … …  
    21132153    else if(Option::target_mode == Option::TARG_WIN_MODE)
    21142154        ret += " -win32";
    2115     else if(Option::target_mode == Option::TARG_QNX6_MODE)
    2116         ret += " -qnx6";
    21172155
    21182156    //configs
    … …  
    21732211}
    21742212
    2175 void
    2176 MakefileGenerator::writeSubDirs(QTextStream &t)
     2213QList<MakefileGenerator::SubTarget*>
     2214MakefileGenerator::
    21772215{
    21782216    QList<SubTarget*> targets;
    … …  
    22162254                st->in_directory = file;
    22172255            }
    2218             while(st->in_directory.right(1) == Option::dir_sep)
    2219                 st->in_directory = st->in_directory.left(st->in_directory.length() - 1);
     2256            while(st->in_directory.)
     2257                st->in_directory1);
    22202258            if(fileInfo(st->in_directory).isRelative())
    22212259                st->out_directory = st->in_directory;
    … …  
    22712309        }
    22722310    }
     2311
     2312
     2313
     2314
     2315
     2316
     2317
    22732318    t << "first: make_default" << endl;
    22742319    int flags = SubTargetInstalls;
    … …  
    22872332        t << "include " << (*qeui_it) << endl;
    22882333
    2289     QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
    2290     if(ofile.lastIndexOf(Option::dir_sep) != -1)
    2291         ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
    2292     t << "MAKEFILE      = " << ofile << endl;
    2293     /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
    2294      * back-slashes to be turned into slashes. */
    2295     t << "QMAKE         = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
    2296     t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
    2297     t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
    2298     t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
    2299     t << "COPY          = " << var("QMAKE_COPY") << endl;
    2300     t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
    2301     t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
    2302     t << "INSTALL_FILE  = " << var("QMAKE_INSTALL_FILE") << endl;
    2303     t << "INSTALL_PROGRAM = " << var("QMAKE_INSTALL_PROGRAM") << endl;
    2304     t << "INSTALL_DIR   = " << var("QMAKE_INSTALL_DIR") << endl;
    2305     t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
    2306     t << "SYMLINK       = " << var("QMAKE_SYMBOLIC_LINK") << endl;
    2307     t << "DEL_DIR       = " << var("QMAKE_DEL_DIR") << endl;
    2308     t << "MOVE          = " << var("QMAKE_MOVE") << endl;
    2309     t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
    2310     t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
     2334    if (!(flags & SubTargetSkipDefaultVariables)) {
     2335        QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
     2336        if(ofile.lastIndexOf(Option::dir_sep) != -1)
     2337            ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
     2338        t << "MAKEFILE      = " << ofile << endl;
     2339        /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
     2340         * back-slashes to be turned into slashes. */
     2341        t << "QMAKE         = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
     2342        t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
     2343        t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
     2344        t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
     2345        t << "COPY          = " << var("QMAKE_COPY") << endl;
     2346        t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
     2347        t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
     2348        t << "INSTALL_FILE  = " << var("QMAKE_INSTALL_FILE") << endl;
     2349        t << "INSTALL_PROGRAM = " << var("QMAKE_INSTALL_PROGRAM") << endl;
     2350        t << "INSTALL_DIR   = " << var("QMAKE_INSTALL_DIR") << endl;
     2351        t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
     2352        t << "SYMLINK       = " << var("QMAKE_SYMBOLIC_LINK") << endl;
     2353        t << "DEL_DIR       = " << var("QMAKE_DEL_DIR") << endl;
     2354        t << "MOVE          = " << var("QMAKE_MOVE") << endl;
     2355        t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
     2356        t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
     2357        t << "SUBTARGETS    = ";     // subtargets are sub-directory
     2358        for(int target = 0; target < targets.size(); ++target)
     2359            t << " \\\n\t\t" << targets.at(target)->target;
     2360        t << endl << endl;
     2361    }
    23112362    writeExtraVariables(t);
    2312     t << "SUBTARGETS    = ";     // subtargets are sub-directory
    2313     for(int target = 0; target < targets.size(); ++target)
    2314         t << " \\\n\t\t" << targets.at(target)->target;
    2315     t << endl << endl;
    23162363
    23172364    QStringList targetSuffixes;
    23182365    const QString abs_source_path = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
    2319     targetSuffixes << "make_default" << "make_first" << "all" << "clean" << "distclean"
    2320                    << QString((flags & SubTargetInstalls) ? "install_subtargets" : "install")
    2321                    << QString((flags & SubTargetInstalls) ? "uninstall_subtargets" : "uninstall");
     2366    if (!(flags & SubTargetSkipDefaultTargets)) {
     2367        targetSuffixes << "make_default" << "make_first" << "all" << "clean" << "distclean"
     2368                       << QString((flags & SubTargetInstalls) ? "install_subtargets" : "install")
     2369                       << QString((flags & SubTargetInstalls) ? "uninstall_subtargets" : "uninstall");
     2370    }
    23222371
    23232372    // generate target rules
    … …  
    24392488    t << endl;
    24402489
    2441     if(project->values("QMAKE_INTERNAL_QMAKE_DEPS").indexOf("qmake_all") == -1)
    2442         project->values("QMAKE_INTERNAL_QMAKE_DEPS").append("qmake_all");
    2443 
    2444     writeMakeQmake(t);
    2445 
    2446     t << "qmake_all:";
    2447     if(!targets.isEmpty()) {
    2448         for(QList<SubTarget*>::Iterator it = targets.begin(); it != targets.end(); ++it) {
    2449             if(!(*it)->profile.isEmpty())
    2450                 t << " " << (*it)->target << "-" << "qmake_all";
    2451         }
    2452     }
    2453     if(project->isEmpty("QMAKE_NOFORCE"))
    2454         t <<  " FORCE";
    2455     if(project->isActiveConfig("no_empty_targets"))
    2456         t << "\n\t" << "@cd .";
    2457     t << endl << endl;
     2490    if (!(flags & SubTargetSkipDefaultTargets)) {
     2491        if(project->values("QMAKE_INTERNAL_QMAKE_DEPS").indexOf("qmake_all") == -1)
     2492            project->values("QMAKE_INTERNAL_QMAKE_DEPS").append("qmake_all");
     2493
     2494        writeMakeQmake(t);
     2495
     2496        t << "qmake_all:";
     2497        if(!targets.isEmpty()) {
     2498            for(QList<SubTarget*>::Iterator it = targets.begin(); it != targets.end(); ++it) {
     2499                if(!(*it)->profile.isEmpty())
     2500                    t << " " << (*it)->target << "-" << "qmake_all";
     2501            }
     2502        }
     2503        if(project->isEmpty("QMAKE_NOFORCE"))
     2504            t <<  " FORCE";
     2505        if(project->isActiveConfig("no_empty_targets"))
     2506            t << "\n\t" << "@cd .";
     2507        t << endl << endl;
     2508    }
    24582509
    24592510    for(int s = 0; s < targetSuffixes.size(); ++s) {
    … …  
    24642515        t << suffix << ":";
    24652516        for(int target = 0; target < targets.size(); ++target) {
    2466             QString targetRule = targets.at(target)->target + "-" + suffix;
     2517            SubTarget *subTarget = targets.at(target);
     2518            if((suffix == "make_first" || suffix == "make_default")
     2519                && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) {
     2520                continue;
     2521            }
     2522            QString targetRule = subTarget->target + "-" + suffix;
    24672523            if(flags & SubTargetOrdered)
    24682524                targetRule += "-ordered";
    … …  
    27232779
    27242780    //do the fixin'
    2725     const QString pwd = qmake_getpwd() + "/";
     2781    QString pwd = qmake_getpwd();
     2782    if (!pwd.endsWith('/'))
     2783        pwd += '/';
    27262784    QString orig_file = ret;
    27272785    if(ret.startsWith(QLatin1Char('~'))) {
    27282786        if(ret.startsWith(QLatin1String("~/")))
    2729             ret = QDir::homePath() + Option::dir_sep + ret.mid(1);
     2787            ret = QDir::homePath() + ret.mid(1);
    27302788        else
    27312789            warn_msg(WarnLogic, "Unable to expand ~ in %s", ret.toLatin1().constData());
    … …  
    28162874    int slsh = f.lastIndexOf(Option::dir_sep);
    28172875    if(slsh != -1)
    2818         file = file.right(file.length() - slsh - 1);
     2876        file 1);
    28192877    QStringList &l = project->values(w);
    28202878    for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
    … …  
    28222880        slsh = file2.lastIndexOf(Option::dir_sep);
    28232881        if(slsh != -1)
    2824             file2 = file2.right(file2.length() - slsh - 1);
     2882            file2 1);
    28252883        if(file2 == file) {
    28262884            warn_msg(WarnLogic, "Found potential symbol conflict of %s (%s) in %s",
    … …  
    29763034            QFileInfo fi(fileInfo(file.fileName()));
    29773035            if(fi.isDir())
    2978                 outdir = file.fileName() + QDir::separator();
     3036                outdir = file.fileName() + ;
    29793037        }
    29803038        if(!outdir.isEmpty() || file.fileName().isEmpty()) {
    … …  
    29963054    if(project->isEmpty("QMAKE_MAKEFILE"))
    29973055        project->values("QMAKE_MAKEFILE").append(file.fileName());
    2998     int slsh = file.fileName().lastIndexOf(Option::dir_sep);
     3056    int slsh = file.fileName().lastIndexOf();
    29993057    if(slsh != -1)
    30003058        mkdir(file.fileName().left(slsh));
    … …  
    30063064        else
    30073065            od = fi.path();
    3008         od = Option::fixPathToTargetOS(od);
    3009         if(QDir::isRelativePath(od))
    3010             od.prepend(Option::output_dir);
     3066        od = QDir::fromNativeSeparators(od);
     3067        if(QDir::isRelativePath(od)) {
     3068            QString dir = Option::output_dir;
     3069            if (!dir.endsWith('/') && !od.isEmpty())
     3070                dir += '/';
     3071            od.prepend(dir);
     3072        }
    30113073        Option::output_dir = od;
    30123074        return true;

  • branches/vendor/nokia/qt/current/qmake/generators/makefile.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    117117        SubTargetInstalls=0x01,
    118118        SubTargetOrdered=0x02,
     119
     120
    119121
    120122        SubTargetsNoFlags=0x00
    121123    };
     124
    122125    void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags);
    123126

  • branches/vendor/nokia/qt/current/qmake/generators/makefiledeps.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    379379    file->dep_checked = true;
    380380
     381
     382
    381383    struct stat fst;
    382384    char *buffer = 0;
    … …  
    385387        int fd;
    386388#if defined(_MSC_VER) && _MSC_VER >= 1400
    387         if (_sopen_s(&fd, fixPathForFile(file->file, true).local().toLatin1().constData(),
     389        if (_sopen_s(&fd, .local().toLatin1().constData(),
    388390            _O_RDONLY, _SH_DENYNO, _S_IREAD) != 0)
    389391            fd = -1;
    390392#else
    391         fd = open(fixPathForFile(file->file, true).local().toLatin1().constData(), O_RDONLY);
     393        fd = open(.local().toLatin1().constData(), O_RDONLY);
    392394#endif
    393395        if(fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode))
    … …  
    624626                if(QDir::isRelativePath(lfn.real())) {
    625627                    if(try_local) {
    626                         QString dir = findFileInfo(file->file).path();
    627                         if(QDir::isRelativePath(dir))
    628                             dir.prepend(qmake_getpwd() + "/");
    629                         if(!dir.endsWith("/"))
    630                             dir += "/";
    631                         QMakeLocalFileName f(dir + lfn.local());
     628                        QDir sourceDir = findFileInfo(sourceFile).dir();
     629                        QMakeLocalFileName f(sourceDir.absoluteFilePath(lfn.local()));
    632630                        if(findFileInfo(f).exists()) {
    633631                            lfn = fixPathForFile(f);

  • branches/vendor/nokia/qt/current/qmake/generators/makefiledeps.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/metamakefile.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6161class BuildsMetaMakefileGenerator : public MetaMakefileGenerator
    6262{
     63
    6364    bool init_flag;
    64 private:
    6565    struct Build {
    6666        QString name, build;
    … …  
    137137        build->name = name;
    138138        build->makefile = createMakefileGenerator(project, false);
    139         makefiles += build;
     139        if (build->makefile){
     140            makefiles += build;
     141        }else {
     142            delete build;
     143            return false;
     144        }
    140145    }
    141146    return true;
    … …  
    259264class SubdirsMetaMakefileGenerator : public MetaMakefileGenerator
    260265{
     266
    261267    bool init_flag;
    262 private:
    263268    struct Subdir {
    264269        Subdir() : makefile(0), indent(0) { }
    … …  
    287292        return false;
    288293    init_flag = true;
     294
    289295
    290296    if(Option::recursive) {
    291         QString old_output_dir = QDir::cleanPath(Option::output_dir);
    292         if(!old_output_dir.endsWith('/'))
    293            old_output_dir += '/';
     297        QString old_output_dir = Option::output_dir;
    294298        QString old_output = Option::output.fileName();
    295         QString oldpwd = QDir::cleanPath(qmake_getpwd());
    296         if(!oldpwd.endsWith('/'))
    297            oldpwd += '/';
     299        QString oldpwd = qmake_getpwd();
     300        QString thispwd = oldpwd;
     301        if(!thispwd.endsWith('/'))
     302           thispwd += '/';
    298303        const QStringList &subdirs = project->values("SUBDIRS");
    299304        static int recurseDepth = -1;
    … …  
    315320            if(!subdir.isRelative()) { //we can try to make it relative
    316321                QString subdir_path = subdir.filePath();
    317                 if(subdir_path.startsWith(oldpwd))
    318                     subdir = QFileInfo(subdir_path.mid(oldpwd.length()));
     322                if(subdir_path.startsWith(pwd))
     323                    subdir = QFileInfo(subdir_path.mid(pwd.length()));
    319324            }
    320325
    … …  
    333338            qmake_setpwd(sub->input_dir);
    334339            Option::output_dir = sub->output_dir;
    335             if(Option::output_dir.at(Option::output_dir.length()-1) != QLatin1Char('/'))
    336                 Option::output_dir += QLatin1Char('/');
    337             sub_proj->read(subdir.fileName());
     340            bool tmpError = !sub_proj->read(subdir.fileName());
    338341            if(!sub_proj->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
    339342                fprintf(stderr, "Project file(%s) not recursed because all requirements not met:\n\t%s\n",
    … …  
    342345                delete sub;
    343346                delete sub_proj;
     347
     348
    344349                continue;
     350
     351
    345352            }
    346353            sub->makefile = MetaMakefileGenerator::createMetaGenerator(sub_proj, sub_name);
    … …  
    350357                const QString output_name = Option::output.fileName();
    351358                Option::output.setFileName(sub->output_file);
    352                 sub->makefile->write(sub->output_dir);
     359                sub->makefile->write(sub->output_dir);
    353360                delete sub;
    354361                qmakeClearCaches();
    … …  
    374381    self->makefile->init();
    375382    subs.append(self);
    376     return true;
     383
     384    return !hasError;
    377385}
    378386
    … …  
    427435#include "msvc_dsp.h"
    428436#include "msvc_vcproj.h"
     437
     438
    429439QT_END_INCLUDE_NAMESPACE
    430440
    … …  
    441451    QString gen = proj->first("MAKEFILE_GENERATOR");
    442452    if(gen.isEmpty()) {
    443         fprintf(stderr, "No generator specified in config file: %s\n",
     453        fprintf(stderr, "\n",
    444454                proj->projectFile().toLatin1().constData());
    445455    } else if(gen == "UNIX") {
    … …  
    463473    } else if(gen == "BMAKE") {
    464474        mkfile = new BorlandMakefileGenerator;
     475
     476
     477
     478
    465479    } else {
    466480        fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
    … …  
    474488
    475489MetaMakefileGenerator *
    476 MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op)
     490MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op)
    477491{
    478492    MetaMakefileGenerator *ret = 0;
    479     if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
    480         Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
    481         if(proj->first("TEMPLATE").endsWith("subdirs"))
     493    if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
     494        Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
     495        if(proj->first("TEMPLATE").endsWith("subdirs"))
    482496            ret = new SubdirsMetaMakefileGenerator(proj, name, op);
    483497    }
    484     if(!ret)
     498    if(!ret)
    485499        ret = new BuildsMetaMakefileGenerator(proj, name, op);
    486     ret->init();
     500    bool res = ret->init();
     501    if (success)
     502        *success = res;
    487503    return ret;
    488504}

  • branches/vendor/nokia/qt/current/qmake/generators/metamakefile.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6363    virtual ~MetaMakefileGenerator();
    6464
    65     static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true);
     65    static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true);
    6666    static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false);
    6767

  • branches/vendor/nokia/qt/current/qmake/generators/projectgenerator.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/projectgenerator.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/unix/unixmake.cpp

    r2 r556  
    11/****************************************************************************
    2  **
    3  ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
    5  **
    6  ** This file is part of the qmake application of the Qt Toolkit.
    7  **
    8  ** $QT_BEGIN_LICENSE:LGPL$
     2**
     3** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
     6**
     7** This file is part of the qmake application of the Qt Toolkit.
     8**
     9** $QT_BEGIN_LICENSE:LGPL$
    910** Commercial Usage
    1011** Licensees holding valid Qt Commercial licenses may use this file in
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    39  **
    40  ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    42  **
    43  ****************************************************************************/
     39**
     40****************************************************************************/
    4441
    4542#include "unixmake.h"
    … …  
    9289        project->values("QMAKE_LIBTOOL").append("libtool --silent");
    9390    if(project->isEmpty("QMAKE_SYMBOLIC_LINK"))
    94         project->values("QMAKE_SYMBOLIC_LINK").append("ln -sf");
     91        project->values("QMAKE_SYMBOLIC_LINK").append("ln -");
    9592
    9693    /* this should probably not be here, but I'm using it to wrap the .t files */
    … …  
    128125    project->values("QMAKE_ORIG_DESTDIR") = project->values("DESTDIR");
    129126    project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
     127
    130128    if((!project->isEmpty("QMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib")) ||
    131129       (project->isActiveConfig("qt") &&  project->isActiveConfig("plugin"))) {
    … …  
    262260                else if(!bundle.endsWith(".plugin"))
    263261                    bundle += ".plugin";
    264                 if(!project->isEmpty("QMAKE_BUNDLE_LOCATION"))
     262                if(project->isEmpty("QMAKE_BUNDLE_LOCATION"))
    265263                    project->values("QMAKE_BUNDLE_LOCATION").append("Contents/MacOS");
    266264            } else {
    … …  
    442440    frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
    443441    frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks"));
    444     const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LFLAGS", "QMAKE_LIBS", QString() };
     442    const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LFLAGS", "QMAKE_LIBS", QString() };
    445443    for(int i = 0; !lflags[i].isNull(); i++) {
    446444        QStringList &l = project->values(lflags[i]);
    … …  
    764762                ret += QString("\n\t$(RANLIB) \"") + dst_targ + "\"";
    765763        } else if(!project->isActiveConfig("debug") && !project->isActiveConfig("nostrip") && !project->isEmpty("QMAKE_STRIP")) {
    766             ret += "\n\t-" + var("QMAKE_STRIP");
     764            ret += "\n\t-;
    767765            if(project->first("TEMPLATE") == "lib" && !project->isEmpty("QMAKE_STRIPFLAGS_LIB"))
    768766                ret += " " + var("QMAKE_STRIPFLAGS_LIB");

  • branches/vendor/nokia/qt/current/qmake/generators/unix/unixmake.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/unix/unixmake2.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    150150        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
    151151        t << "LIBS          = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKDIR_FLAGS") << " "
    152           << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
     152          << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
    153153    }
    154154
    … …  
    164164    t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
    165165    t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
     166
    166167    t << "INSTALL_FILE  = " << var("QMAKE_INSTALL_FILE") << endl;
    167168    t << "INSTALL_DIR   = " << var("QMAKE_INSTALL_DIR") << endl;
    … …  
    14241425
    14251426    // libs
    1426     QStringList libs;
    1427     if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {
    1428         libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
    1429     } else {
    1430         libs << "QMAKE_LIBS"; //obvious one
    1431     }
    1432     libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
    14331427    t << "Libs: ";
    14341428    QString pkgConfiglibDir;
    … …  
    14501444    }
    14511445    t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
     1446
     1447
     1448
     1449
     1450
     1451
     1452
     1453
     1454
    14521455    t << "Libs.private: ";
    14531456    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {

  • branches/vendor/nokia/qt/current/qmake/generators/win32/borland_bmake.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/win32/borland_bmake.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/win32/mingw_make.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8383bool MingwMakefileGenerator::findLibraries()
    8484{
    85     QStringList &l = project->values("QMAKE_LIBS");
     85    return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE");
     86}
     87
     88bool MingwMakefileGenerator::findLibraries(const QString &where)
     89{
     90    QStringList &l = project->values(where);
    8691
    8792    QList<QMakeLocalFileName> dirs;
    … …  
    259264    // LIBS defined in Profile comes first for gcc
    260265    project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
     266
    261267
    262268    QString targetfilename = project->values("TARGET").first();
    … …  
    345351        if(!project->values("QMAKE_LIBDIR").isEmpty())
    346352            writeLibDirPart(t);
    347         t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
     353        t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' '
     354          << var("QMAKE_LIBS_PRIVATE").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
    348355    }
    349356}

  • branches/vendor/nokia/qt/current/qmake/generators/win32/mingw_make.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    7373
    7474    virtual bool findLibraries();
     75
    7576    void fixTargetExt();
    7677

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_dsp.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    683683                if(!profile.endsWith(Option::dir_sep))
    684684                    profile += Option::dir_sep;
    685                 profile += fi.baseName() + ".pro";
     685                profile += fi.baseName() + ;
    686686                subdirs.append(profile);
    687687            } else {

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_dsp.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_nmake.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    173173
    174174    project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
     175
    175176    processVars();
    176177

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_nmake.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_objectmodel.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5050const char _Configuration[]                     = "Configuration";
    5151const char _Configurations[]                    = "Configurations";
    52 const char _File[]                              = "File";
     52const char _File[]                              = "File";
    5353const char _FileConfiguration[]                 = "FileConfiguration";
    54 const char _Files[]                             = "Files";
     54const char _Files[]                             = "Files";
    5555const char _Filter[]                            = "Filter";
    5656const char _Globals[]                           = "Globals";
    … …  
    485485            if (opt.contains('a') && !opt.contains('s') && !opt.contains('c'))
    486486                ExceptionHandling = ehSEH;
    487             else if (!opt.contains('a') && opt.contains("s-") && opt.contains("c-")) 
     487            else if (!opt.contains('a') && opt.contains("s-") && opt.contains("c-"))
    488488                ExceptionHandling = ehNone;
    489489            else if (!opt.contains('a') && opt.contains('s') && opt.contains('c'))
    … …  
    13951395            TargetMachine = machineX86;
    13961396            break;
     1397
     1398
     1399
    13971400        // so we put the others in AdditionalOptions...
    1398         case 0x0005b94: // X64
    13991401        case 0x0046063: // AM33
    14001402        case 0x000466d: // ARM
    … …  
    23822384    for (int i = 0; i < tool.Files.count(); ++i) {
    23832385        const VCFilterFile &info = tool.Files.at(i);
    2384         xml << tag(_File)
     2386        xml << tag(_File)
    23852387                << attrS(_RelativePath, Option::fixPathToLocalOS(info.file))
    23862388            << data(); // In case no custom builds, to avoid "/>" endings
    23872389        tool.outputFileConfig(xml, tool.Files.at(i).file);
    2388         xml << closetag(_File);
     2390        xml << closetag(_File);
    23892391    }
    23902392    if (!tool.Name.isEmpty())
    … …  
    24222424            << tool.Configuration;
    24232425    xml     << closetag(_Configurations)
    2424             << tag(_Files);
     2426            << tag(_Files);
    24252427    // Add this configuration into a multi-config project, since that's where we have the flat/tree
    24262428    // XML output functionality
    … …  
    24382440    }
    24392441    tempProj.outputFilter(xml, "RootFiles");
    2440     xml     << closetag(_Files)
     2442    xml     << closetag(_Files)
    24412443            << tag(_Globals)
    24422444                << data(); // No "/>" end tag
    … …  
    24932495                                  const QString &filtername)
    24942496{
    2495     xml << tag(_File)
     2497    xml << tag(_File)
    24962498            << attrS(_RelativePath, Option::fixPathToLocalOS(info.file));
    24972499    for (int i = 0; i < SingleProjects.count(); ++i) {
    … …  
    25212523            filter.outputFileConfig(xml, info.file);
    25222524    }
    2523     xml << closetag(_File);
     2525    xml << closetag(_File);
    25242526}
    25252527
    … …  
    26162618        xml     << tool.SingleProjects.at(i).Configuration;
    26172619    xml     << closetag(_Configurations)
    2618             << tag(_Files);
     2620            << tag(_Files);
    26192621    tool.outputFilter(xml, "Sources");
    26202622    tool.outputFilter(xml, "Headers");
    … …  
    26282630    }
    26292631    tool.outputFilter(xml, "RootFiles");
    2630     xml     << closetag(_Files)
     2632    xml     << closetag(_Files)
    26312633            << tag(_Globals)
    26322634            << data(); // No "/>" end tag

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_objectmodel.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    299299enum machineTypeOption {
    300300    machineNotSet,
    301     machineX86
     301    machineX86,
     302    machineX64 = 17
    302303};
    303304enum midlCharOption {

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_vcproj.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    121121
    122122    HKEY handle = 0;
    123     LONG res;
    124     QT_WA( {
    125         res = RegOpenKeyExW(parentHandle, (WCHAR*)rSubkeyPath.utf16(),
    126                             0, KEY_READ, &handle);
    127     } , {
    128         res = RegOpenKeyExA(parentHandle, rSubkeyPath.toLocal8Bit(),
    129                             0, KEY_READ, &handle);
    130     } );
     123    LONG res = RegOpenKeyEx(parentHandle, (wchar_t*)rSubkeyPath.utf16(), 0, KEY_READ, &handle);
    131124
    132125    if (res != ERROR_SUCCESS)
    … …  
    136129    DWORD dataType;
    137130    DWORD dataSize;
    138     QT_WA( {
    139         res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize);
    140     }, {
    141         res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, &dataType, 0, &dataSize);
    142     } );
     131    res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize);
    143132    if (res != ERROR_SUCCESS) {
    144133        RegCloseKey(handle);
    … …  
    148137    // get the value
    149138    QByteArray data(dataSize, 0);
    150     QT_WA( {
    151         res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, 0,
    152                                reinterpret_cast<unsigned char*>(data.data()), &dataSize);
    153     }, {
    154         res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, 0,
    155                                reinterpret_cast<unsigned char*>(data.data()), &dataSize);
    156     } );
     139    res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, 0,
     140                          reinterpret_cast<unsigned char*>(data.data()), &dataSize);
    157141    if (res != ERROR_SUCCESS) {
    158142        RegCloseKey(handle);
    … …  
    164148        case REG_EXPAND_SZ:
    165149        case REG_SZ: {
    166             QT_WA( {
    167                 result = QString::fromUtf16(((const ushort*)data.constData()));
    168             }, {
    169                 result = QString::fromLatin1(data.constData());
    170             } );
     150            result = QString::fromWCharArray(((const wchar_t *)data.constData()));
    171151            break;
    172152        }
    … …  
    176156            int i = 0;
    177157            for (;;) {
    178                 QString s;
    179                 QT_WA( {
    180                     s = QString::fromUtf16((const ushort*)data.constData() + i);
    181                 }, {
    182                     s = QString::fromLatin1(data.constData() + i);
    183                 } );
     158                QString s = QString::fromWCharArray((const wchar_t *)data.constData() + i);
    184159                i += s.length() + 1;
    185160
    … …  
    194169        case REG_NONE:
    195170        case REG_BINARY: {
    196             QT_WA( {
    197                 result = QString::fromUtf16((const ushort*)data.constData(), data.size()/2);
    198             }, {
    199                 result = QString::fromLatin1(data.constData(), data.size());
    200             } );
     171            result = QString::fromWCharArray((const wchar_t *)data.constData(), data.size() / 2);
    201172            break;
    202173        }
    … …  
    525496                if(!profile.endsWith(Option::dir_sep))
    526497                    profile += Option::dir_sep;
    527                 profile += fi.baseName() + ".pro";
     498                profile += fi.baseName() + ;
    528499                subdirs.append(profile);
    529500            } else {
    … …  
    575546
    576547                        // We assume project filename is [QMAKE_ORIG_TARGET].vcproj
    577                         QString vcproj = unescapeFilePath(fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION"));
     548                        QString vcproj = unescapeFilePath() + project->first("VCPROJ_EXTENSION"));
    578549                        QString vcprojDir = qmake_getpwd();
    579550
    … …  
    653624
    654625                        // Add all unknown libs to the deps
    655                         QStringList where("QMAKE_LIBS");
     626                        QStringList where;
    656627                        if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
    657628                            where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
    … …  
    10311002    if(project->isActiveConfig("debug")){
    10321003        // Debug version
    1033         conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
    10341004        conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_DEBUG"));
    10351005        if((projectTarget == Application) || (projectTarget == StaticLib))
    … …  
    10391009    } else {
    10401010        // Release version
    1041         conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
    10421011        conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_RELEASE"));
    10431012        conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
    … …  
    12041173        targetPath = QString("%CSIDL_PROGRAM_FILES%\\") + project->first("TARGET");
    12051174    if (targetPath.endsWith("/") || targetPath.endsWith("\\"))
    1206         targetPath = targetPath.mid(0,targetPath.size()-1);
     1175        targetPath1);
    12071176
    12081177    // Only deploy Qt libs for shared build
    … …  
    12711240        // get item.path
    12721241        QString devicePath = project->first(item + ".path");
    1273         // if the path does not exist, skip it
    12741242        if (devicePath.isEmpty())
    1275             continue;
     1243            ;
    12761244        // check if item.path is relative (! either /,\ or %)
    12771245        if (!(devicePath.at(0) == QLatin1Char('/')
    … …  
    15831551
    15841552    project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
     1553
    15851554
    15861555     // Get filename w/o extension -----------------------------------
    … …  
    16261595    // $$QMAKE.. -> $$MSVCPROJ.. -------------------------------------
    16271596    project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS");
     1597
    16281598    project->values("MSVCPROJ_LFLAGS") += project->values("QMAKE_LFLAGS");
    16291599    if(!project->values("QMAKE_LIBDIR").isEmpty()) {

  • branches/vendor/nokia/qt/current/qmake/generators/win32/msvc_vcproj.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/generators/win32/winmakefile.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    433433            rcFile.close();
    434434        }
    435         if (writeRcFile && rcFile.open(QFile::WriteOnly)) {
    436             rcFile.write(rcString);
    437             rcFile.close();
     435        if (writeRcFile) {
     436            bool ok;
     437            ok = rcFile.open(QFile::WriteOnly);
     438            if (!ok) {
     439                // The file can't be opened... try creating the containing
     440                // directory first (needed for clean shadow builds)
     441                QDir().mkpath(QFileInfo(rcFile).path());
     442                ok = rcFile.open(QFile::WriteOnly);
     443            }
     444            if (!ok) {
     445                ::fprintf(stderr, "Cannot open for writing: %s", rcFile.fileName().toLatin1().constData());
     446                ::exit(1);
     447            }
     448            rcFile.write(rcString);
     449            rcFile.close();
    438450        }
    439451        if (project->values("QMAKE_WRITE_DEFAULT_RC").isEmpty())
    … …  
    615627    QString orgDestDir = var("DESTDIR");
    616628    QString destDir = Option::fixPathToTargetOS(orgDestDir, false);
    617     if (orgDestDir.endsWith('/') || orgDestDir.endsWith(Option::dir_sep))
     629    if ())
    618630        destDir += Option::dir_sep;
    619631    QString target = QString(project->first("TARGET")+project->first("TARGET_EXT"));
    … …  
    697709            writeLibDirPart(t);
    698710        t << var("QMAKE_LFLAGS") << endl;
    699         t << "LIBS          = " << var("QMAKE_LIBS") << endl;
     711        t << "LIBS          = " << var("QMAKE_LIBS") << endl;
    700712    }
    701713}

  • branches/vendor/nokia/qt/current/qmake/generators/win32/winmakefile.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    9090
    9191inline bool Win32MakefileGenerator::findLibraries()
    92 { return findLibraries("QMAKE_LIBS"); }
     92{ return findLibraries("QMAKE_LIBS"); }
    9393
    9494QT_END_NAMESPACE

  • branches/vendor/nokia/qt/current/qmake/generators/xmloutput.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    278278{
    279279    bool cont = true;
    280     if (!tagStack.contains(tag) && tag != QString()) {
     280    if (!tagStack.contains(tag) && ()) {
    281281        //warn_msg(WarnLogic, "<%s>: Cannot close to tag <%s>, not on stack", tagStack.last().latin1(), tag.latin1());
    282282        qDebug("<%s>: Cannot close to tag <%s>, not on stack", tagStack.last().toLatin1().constData(), tag.toLatin1().constData());

  • branches/vendor/nokia/qt/current/qmake/generators/xmloutput.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/main.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8585int runQMake(int argc, char **argv)
    8686{
     87
     88
     89
     90
     91
     92
    8793    // parse command line
    8894    int ret = Option::init(argc, argv);
    … …  
    9298        return 0;
    9399    }
    94 
    95     // report Qt usage for commercial customers with a "metered license" (currently experimental)
    96 #if QT_EDITION != QT_EDITION_OPENSOURCE
    97     QString reporterPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator()
    98                            + "qtusagereporter";
    99 #if defined(Q_OS_WIN)
    100     reporterPath += ".exe";
    101 #endif
    102     if (QFile::exists(reporterPath))
    103         system(qPrintable(reporterPath + " qmake"));
    104 #endif
    105100
    106101    QString oldpwd = qmake_getpwd();
    … …  
    174169        }
    175170
    176         MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false);
     171        bool success = true;
     172        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false, &success);
     173        if (!success)
     174            exit_val = 3;
     175
    177176        if(mkfile && !mkfile->write(oldpwd)) {
    178177            if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)

  • branches/vendor/nokia/qt/current/qmake/meta.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/meta.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/option.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6969QString Option::yacc_ext;
    7070QString Option::pro_ext;
     71
    7172QString Option::dir_sep;
    7273QString Option::dirlist_sep;
    … …  
    100101#elif defined(Q_OS_MAC)
    101102Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE;
    102 #elif defined(Q_OS_QNX6)
    103 Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE;
    104103#else
    105104Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
    … …  
    153152            "                 be built,\n"
    154153            "                 defaults to %s\n"
     154
     155
     156
    155157            "  -makefile      Put qmake into makefile generation mode%s\n"
    156158            "                 In this mode qmake interprets files as project files to\n"
    … …  
    382384    Option::yacc_ext = ".y";
    383385    Option::pro_ext = ".pro";
     386
    384387#ifdef Q_OS_WIN
    385388    Option::dirlist_sep = ";";
    … …  
    717720    QString ret;
    718721#if defined( Q_OS_WIN )
    719     QFileInfo filePath;
    720     QT_WA({
    721         unsigned short module_name[256];
    722         GetModuleFileNameW(0, reinterpret_cast<wchar_t *>(module_name), sizeof(module_name));
    723         filePath = QString::fromUtf16(module_name);
    724     }, {
    725         char module_name[256];
    726         GetModuleFileNameA(0, module_name, sizeof(module_name));
    727         filePath = QString::fromLocal8Bit(module_name);
    728     });
     722    wchar_t module_name[MAX_PATH];
     723    GetModuleFileName(0, module_name, MAX_PATH);
     724    QFileInfo filePath = QString::fromWCharArray(module_name);
    729725    ret = filePath.filePath();
    730726#else

  • branches/vendor/nokia/qt/current/qmake/option.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    9393    static QString sysenv_mod;
    9494    static QString pro_ext;
     95
    9596    static QString res_ext;
    9697    static char field_sep;
    … …  
    150151    static bool recursive;
    151152    static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs;
    152     enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
     153    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE };
    153154    static TARG_MODE target_mode;
    154155    static QString user_template, user_template_prefix;

  • branches/vendor/nokia/qt/current/qmake/project.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4444#include "option.h"
    4545#include "cachekeys.h"
     46
     47
    4648
    4749#include <qdatetime.h>
    … …  
    5860#include <sys/utsname.h>
    5961#elif defined(Q_OS_WIN32)
    60 #include <Windows.h>
     62#include <indows.h>
    6163#endif
    6264#include <stdio.h>
    … …  
    7779                  E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
    7880                  E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND,
    79                   E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE };
     81                  E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE,
     82                  E_SIZE };
    8083QMap<QString, ExpandFunc> qmake_expandFunctions()
    8184{
    … …  
    108111        qmake_expand_functions->insert("prompt", E_PROMPT);
    109112        qmake_expand_functions->insert("replace", E_REPLACE);
     113
    110114    }
    111115    return *qmake_expand_functions;
    … …  
    153157    return *qmake_test_functions;
    154158}
    155 
    156 QT_END_NAMESPACE
    157 
    158 #ifdef QTSCRIPT_SUPPORT
    159 #include "qscriptvalue.h"
    160 #include "qscriptengine.h"
    161 #include "qscriptvalueiterator.h"
    162 
    163 QT_BEGIN_NAMESPACE
    164 
    165 static QScriptValue qscript_projectWrapper(QScriptEngine *eng, QMakeProject *project,
    166                                     const QMap<QString, QStringList> &place);
    167 
    168 static bool qscript_createQMakeProjectMap(QMap<QString, QStringList> &vars, QScriptValue js)
    169 {
    170     QScriptValueIterator it(js);
    171     while(it.hasNext()) {
    172         it.next();
    173         vars[it.name()] = qscriptvalue_cast<QStringList>(it.value());
    174     }
    175     return true;
    176 }
    177 
    178 static QScriptValue qscript_call_testfunction(QScriptContext *context, QScriptEngine *engine)
    179 {
    180     QMakeProject *self = qscriptvalue_cast<QMakeProject*>(context->callee().property("qmakeProject"));
    181     QString func = context->callee().property("functionName").toString();
    182     QStringList args;
    183     for(int i = 0; i < context->argumentCount(); ++i)
    184         args += context->argument(i).toString();
    185     QMap<QString, QStringList> place = self->variables();
    186     qscript_createQMakeProjectMap(place, engine->globalObject().property("qmake"));
    187     QScriptValue ret(engine, self->doProjectTest(func, args, place));
    188     engine->globalObject().setProperty("qmake", qscript_projectWrapper(engine, self, place));
    189     return ret;
    190 }
    191 
    192 static QScriptValue qscript_call_expandfunction(QScriptContext *context, QScriptEngine *engine)
    193 {
    194     QMakeProject *self = qscriptvalue_cast<QMakeProject*>(context->callee().property("qmakeProject"));
    195     QString func = context->callee().property("functionName").toString();
    196     QStringList args;
    197     for(int i = 0; i < context->argumentCount(); ++i)
    198         args += context->argument(i).toString();
    199     QMap<QString, QStringList> place = self->variables();
    200     qscript_createQMakeProjectMap(place, engine->globalObject().property("qmake"));
    201     QScriptValue ret = qScriptValueFromValue(engine, self->doProjectExpand(func, args, place));
    202     engine->globalObject().setProperty("qmake", qscript_projectWrapper(engine, self, place));
    203     return ret;
    204 }
    205 
    206 static QScriptValue qscript_projectWrapper(QScriptEngine *eng, QMakeProject *project,
    207                                            const QMap<QString, QStringList> &place)
    208 {
    209     QScriptValue ret = eng->newObject();
    210     {
    211         QStringList testFuncs = qmake_testFunctions().keys() + project->userTestFunctions();
    212         for(int i = 0; i < testFuncs.size(); ++i) {
    213             QString funcName = testFuncs.at(i);
    214             QScriptValue fun = eng->newFunction(qscript_call_testfunction);
    215             fun.setProperty("qmakeProject", eng->newVariant(qVariantFromValue(project)));
    216             fun.setProperty("functionName", QScriptValue(eng, funcName));
    217             eng->globalObject().setProperty(funcName, fun);
    218         }
    219     }
    220     {
    221         QStringList testFuncs = qmake_expandFunctions().keys() + project->userExpandFunctions();
    222         for(int i = 0; i < testFuncs.size(); ++i) {
    223             QString funcName = testFuncs.at(i);
    224             QScriptValue fun = eng->newFunction(qscript_call_expandfunction);
    225             fun.setProperty("qmakeProject", eng->newVariant(qVariantFromValue(project)));
    226             fun.setProperty("functionName", QScriptValue(eng, funcName));
    227             eng->globalObject().setProperty(funcName, fun);
    228         }
    229     }
    230     for(QMap<QString, QStringList>::ConstIterator it = place.begin(); it != place.end(); ++it)
    231         ret.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
    232     return ret;
    233 }
    234 
    235 static QScriptValue qscript_toArray(QScriptEngine *eng, const QStringList &elts)
    236 {
    237     QScriptValue a = eng->newArray();
    238     for (int i = 0; i < elts.count(); ++i)
    239         a.setProperty(i, QScriptValue(eng, elts.at(i)));
    240     return a;
    241 }
    242 
    243 QT_END_NAMESPACE
    244 
    245 #endif
    246 
    247 QT_BEGIN_NAMESPACE
    248159
    249160struct parser_info {
    … …  
    597508}
    598509
     510
     511
     512
     513
     514
     515
     516
     517
     518
     519
     520
     521
     522
     523
     524
     525
     526
     527
     528
     529
     530
     531
     532
     533
     534
     535
     536
     537
     538
     539
     540
     541
     542
     543
     544
     545
     546
     547
     548
     549
     550
     551
     552
     553
     554
     555
     556
     557
     558
     559
     560
     561
     562
     563
     564
     565
     566
     567
     568
     569
     570
     571
     572
    599573/*
    600574   1) environment variable QMAKEFEATURES (as separated by colons)
    … …  
    623597            break;
    624598        case Option::TARG_UNIX_MODE:
    625             concat << base_concat + QDir::separator() + "unix";
    626             break;
     599            {
     600                if (isForSymbian())
     601                    concat << base_concat + QDir::separator() + "symbian";
     602                else
     603                    concat << base_concat + QDir::separator() + "unix";
     604                break;
     605            }
    627606        case Option::TARG_WIN_MODE:
    628             concat << base_concat + QDir::separator() + "win32";
    629             break;
     607            {
     608                if (isForSymbian())
     609                    concat << base_concat + QDir::separator() + "symbian";
     610                else
     611                    concat << base_concat + QDir::separator() + "win32";
     612                break;
     613            }
    630614        case Option::TARG_MAC9_MODE:
    631615            concat << base_concat + QDir::separator() + "mac";
    632616            concat << base_concat + QDir::separator() + "mac9";
    633             break;
    634         case Option::TARG_QNX6_MODE: //also a unix
    635             concat << base_concat + QDir::separator() + "qnx6";
    636             concat << base_concat + QDir::separator() + "unix";
    637617            break;
    638618        }
    … …  
    14841464                return false;
    14851465            }
     1466
     1467
     1468
    14861469            if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty()) {
    14871470                debug_msg(1, "QMAKECACHE file: reading %s", Option::mkfile::cachefile.toLatin1().constData());
    … …  
    15301513    if(cmd & ReadProFile) { // parse project file
    15311514        debug_msg(1, "Project file: reading %s", pfile.toLatin1().constData());
    1532         if(pfile != "-" && !QFile::exists(pfile) && !pfile.endsWith(".pro"))
    1533             pfile += ".pro";
     1515        if(pfile != "-" && !QFile::exists(pfile) && !pfile.endsWith())
     1516            pfile += ;
    15341517        if(!read(pfile, vars))
    15351518            return false;
    … …  
    16181601        return false;
    16191602
    1620     //mkspecs
    1621     if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE ||
    1622         Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
    1623         return true;
    1624     else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
    1625         return true;
    1626     else if(Option::target_mode == Option::TARG_QNX6_MODE && x == "qnx6")
    1627         return true;
    1628     else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9")
    1629         return true;
    1630     else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) &&
    1631             x == "mac")
    1632         return true;
    1633     else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32")
    1634         return true;
    1635     QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard);
    16361603    static QString spec;
    16371604    if(spec.isEmpty())
    16381605        spec = QFileInfo(Option::mkfile::qmakespec).fileName();
     1606
     1607
     1608
     1609
     1610
     1611
     1612
     1613
     1614
     1615
     1616
     1617
     1618
     1619
     1620
     1621
     1622
     1623
     1624
     1625
     1626
     1627
     1628
    16391629    if((regex && re.exactMatch(spec)) || (!regex && spec == x))
    16401630        return true;
    … …  
    17271717            static QStringList *feature_roots = 0;
    17281718            if(!feature_roots) {
     1719
    17291720                feature_roots = new QStringList(qmake_feature_paths(prop));
    17301721                qmakeAddCacheClear(qmakeDeleteCacheClear_QStringList, (void**)&feature_roots);
    … …  
    18121803    parser_info pi = parser;
    18131804    if(format == JSFormat) {
    1814 #ifdef QTSCRIPT_SUPPORT
    1815         eng.globalObject().setProperty("qmake", qscript_projectWrapper(&eng, this, place));
    1816         QFile f(file);
    1817         if (f.open(QFile::ReadOnly)) {
    1818             QString code = f.readAll();
    1819             QScriptValue r = eng.evaluate(code);
    1820             if(eng.hasUncaughtException()) {
    1821                 const int lineNo = eng.uncaughtExceptionLineNumber();
    1822                 fprintf(stderr, "%s:%d: %s\n", file.toLatin1().constData(), lineNo,
    1823                         r.toString().toLatin1().constData());
    1824             } else {
    1825                 parsed = true;
    1826                 QScriptValue variables = eng.globalObject().property("qmake");
    1827                 if (variables.isValid() && variables.isObject())
    1828                     qscript_createQMakeProjectMap(place, variables);
    1829             }
    1830         }
    1831 #else
    18321805        warn_msg(WarnParser, "%s:%d: QtScript support disabled for %s.",
    18331806                 pi.file.toLatin1().constData(), pi.line_no, orig_file.toLatin1().constData());
    1834 #endif
    18351807    } else {
    18361808        QStack<ScopeBlock> sc = scope_blocks;
    … …  
    21672139            QMakeProjectEnv env(place);
    21682140            char buff[256];
    2169             FILE *proc = QT_POPEN(args[0].toLatin1(), "r");
    21702141            bool singleLine = true;
    21712142            if(args.count() > 1)
    21722143                singleLine = (args[1].toLower() == "true");
    21732144            QString output;
     2145
    21742146            while(proc && !feof(proc)) {
    21752147                int read_in = int(fread(buff, 1, 255, proc));
    … …  
    23202292        }
    23212293        break; }
     2294
     2295
     2296
     2297
     2298
     2299
     2300
     2301
     2302
     2303
    23222304    default: {
    2323 #ifdef QTSCRIPT_SUPPORT
    2324         {
    2325             QScriptValue jsFunc = eng.globalObject().property(func);
    2326             if(jsFunc.isFunction()) {
    2327                 QScriptValueList jsArgs;
    2328                 for(int i = 0; i < args.size(); ++i)
    2329                     jsArgs += QScriptValue(&eng, args.at(i));
    2330                 QScriptValue jsRet = jsFunc.call(eng.globalObject(), jsArgs);
    2331                 ret = qscriptvalue_cast<QStringList>(jsRet);
    2332                 break;
    2333             }
    2334         }
    2335 #endif
    23362305        fprintf(stderr, "%s:%d: Unknown replace function: %s\n",
    23372306                parser.file.toLatin1().constData(), parser.line_no,
    … …  
    24132382            int lhs_int = lhs.toInt(&ok);
    24142383            if(ok) {
    2415                 if(func == "greaterThan")
     2384                if(func)
    24162385                    return lhs_int > rhs_int;
    24172386                return lhs_int < rhs_int;
    … …  
    27082677        QString parseInto;
    27092678        const bool include_statement = (func_t == T_INCLUDE);
    2710         bool ignore_error = include_statement;
    2711         if(args.count() == 2) {
     2679        bool ignore_error = ;
     2680        if(args.count() = 2) {
    27122681            if(func_t == T_INCLUDE) {
    27132682                parseInto = args[1];
     2683
     2684
     2685
     2686
     2687
    27142688            } else {
    27152689                QString sarg = args[1];
    … …  
    27532727            warn_msg(WarnParser, "%s:%d: Duplicate of loaded feature %s",
    27542728                     parser.file.toLatin1().constData(), parser.line_no, file.toLatin1().constData());
    2755         } else if(stat == IncludeNoExist && include_statement) {
    2756             warn_msg(WarnParser, "%s:%d: Unable to find file for inclusion %s",
     2729        } else if(stat == IncludeNoExist && ) {
     2730            warn_msg(Warn, "%s:%d: Unable to find file for inclusion %s",
    27572731                     parser.file.toLatin1().constData(), parser.line_no, file.toLatin1().constData());
    27582732            return false;
    … …  
    27972771        return true; }
    27982772    default:
    2799 #ifdef QTSCRIPT_SUPPORT
    2800         {
    2801             QScriptValue jsFunc = eng.globalObject().property(func);
    2802             if(jsFunc.isFunction()) {
    2803                 QScriptValueList jsArgs;
    2804                 for(int i = 0; i < args.size(); ++i)
    2805                     jsArgs += QScriptValue(&eng, args.at(i));
    2806                 QScriptValue jsRet = jsFunc.call(eng.globalObject(), jsArgs);
    2807                 if(eng.hasUncaughtException())
    2808                     return false;
    2809                 return qscriptvalue_cast<bool>(jsRet);
    2810             }
    2811         }
    2812 #endif
    28132773        fprintf(stderr, "%s:%d: Unknown test function: %s\n", parser.file.toLatin1().constData(), parser.line_no,
    28142774                func.toLatin1().constData());
    … …  
    31263086        } else if(type == "name") {
    31273087            DWORD name_length = 1024;
    3128             TCHAR name[1024];
    3129             if(GetComputerName(name, &name_length))
    3130                 ret = QString::fromUtf16((ushort*)name, name_length);
     3088            name[1024];
     3089            if(GetComputerName(name, &name_length))
     3090                ret = QString::from);
    31313091        } else if(type == "version" || type == "version_string") {
    31323092            QSysInfo::WinVersion ver = QSysInfo::WindowsVersion;
    … …  
    31943154        if (place[var].isEmpty())
    31953155            return values("DIR_SEPARATOR", place);
     3156
     3157
     3158
    31963159    }
    31973160    //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));

  • branches/vendor/nokia/qt/current/qmake/project.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4949#include <qmap.h>
    5050#include <qmetatype.h>
    51 
    52 #ifndef QT_BUILD_QMAKE_LIBRARY
    53 # define QTSCRIPT_SUPPORT
    54 #endif
    55 
    56 #ifdef QTSCRIPT_SUPPORT
    57 # include <qscriptengine.h>
    58 #endif
    5951
    6052QT_BEGIN_NAMESPACE
    … …  
    8173    friend struct FunctionBlock;
    8274
    83 #ifdef QTSCRIPT_SUPPORT
    84     QScriptEngine eng;
    85 #endif
    8675    QStack<ScopeBlock> scope_blocks;
    8776    QStack<FunctionBlock *> function_blocks;
    … …  
    204193{ return vars; }
    205194
     195
     196
     197
     198
    206199QT_END_NAMESPACE
    207200

  • branches/vendor/nokia/qt/current/qmake/property.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/property.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/qmake/qmake.pri

    r2 r556  
    1414           generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
    1515           generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \
    16            generators/win32/msvc_objectmodel.cpp
     16           generators/win32/msvc_objectmodel.cpp \
     17           generators/symbian/symmake.cpp \
     18           generators/symbian/symmake_abld.cpp \
     19           generators/symbian/symmake_sbsv2.cpp \
     20           generators/symbian/initprojectdeploy_symbian.cpp
     21
    1722HEADERS += project.h property.h generators/makefile.h \
    1823           generators/unix/unixmake.h meta.h option.h cachekeys.h \
    … …  
    2126           generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
    2227           generators/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \
    23            generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h
     28           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
     29           generators/symbian/symmake.h \
     30           generators/symbian/symmake_abld.h \
     31           generators/symbian/symmake_sbsv2.h \
     32           generators/symbian/epocroot.h \
     33           generators/symbian/initprojectdeploy_symbian.h
    2434
    2535contains(QT_EDITION, OpenSource) {
    … …  
    4757        qhash.cpp \
    4858        qiodevice.cpp \
    49         qlistdata.cpp \
     59        qlist.cpp \
    5060        qlinkedlist.cpp \
    5161        qlocale.cpp \
    … …  
    5464        qmetatype.cpp \
    5565        qregexp.cpp \
     66
     67
    5668        qstring.cpp \
    5769        qstringlist.cpp \
    … …  
    6476        qvariant.cpp \
    6577        qvector.cpp \
    66         qvsnprintf.cpp
     78        qvsnprintf.cpp \
     79        qxmlstream.cpp \
     80        qxmlutils.cpp
    6781
    6882   HEADERS+= \
    … …  
    8094        qabstractfileengine.h \
    8195        qfileinfo.h \
    82         qfileinfo_p.h \
    8396        qglobal.h \
    8497        qnumeric.h \
    … …  
    92105        qmetatype.h \
    93106        qregexp.h \
     107
     108
    94109        qstring.h \
    95110        qstringlist.h \
    … …  
    99114        qurl.h \
    100115        quuid.h \
    101         qvector.h
     116        qvector.h \
     117        qxmlstream.h \
     118        qxmlutils.h
    102119
    103120    unix {
    … …  
    105122        mac {
    106123          SOURCES += qcore_mac.cpp qsettings_mac.cpp
    107           QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)
     124          QMAKE_MACOSX_DEPLOYMENT_TARGET = 10. (exported)
    108125          LIBS += -framework ApplicationServices
    109126        }
    … …  
    118135    }
    119136    DEFINES *= QT_NO_QOBJECT
    120     include($$QT_SOURCE_TREE/src/script/script.pri)
    121137} else {
    122138    CONFIG += qt
    123     QT = core script
     139    QT = core
    124140}
    125141*-g++:profiling {

  • branches/vendor/nokia/qt/current/qmake/qmake.pro

    r2 r556  
    1616         $$QT_SOURCE_TREE/src/corelib/tools \
    1717         $$QT_SOURCE_TREE/src/corelib/kernel \
     18
    1819         $$QT_SOURCE_TREE/src/corelib/plugin \
    19          $$QT_SOURCE_TREE/src/corelib/io \
    20          $$QT_SOURCE_TREE/src/script
    21 INCPATH += generators generators/unix generators/win32 generators/mac \
    22            $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore \
    23            $$QT_SOURCE_TREE/qmake $$QT_SOURCE_TREE/include/QtScript
     20         $$QT_SOURCE_TREE/src/corelib/xml \
     21         $$QT_SOURCE_TREE/src/corelib/io
     22INCPATH += generators generators/unix generators/win32 generators/mac generators/symbian \
     23           $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore
    2424include(qmake.pri)
    2525

  • branches/vendor/nokia/qt/current/qmake/qmake_pch.h

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5454#include <qfile.h>
    5555//#include "winmakefile.h"
    56 #include <qtextstream.h>
     56#include <qtextstream.h>
    5757//#include "project.h"
    5858#include <qstring.h>
Note: See TracChangeset for help on using the changeset viewer.