diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/Makefile.unix | 27 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 6 | ||||
-rw-r--r-- | qmake/Makefile.win32-g++ | 6 | ||||
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
-rw-r--r-- | qmake/project.cpp | 2 | ||||
-rw-r--r-- | qmake/qmake.pri | 9 | ||||
-rw-r--r-- | qmake/qmake_pch.h | 5 |
7 files changed, 39 insertions, 18 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 03a8597eff..ad430e2930 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -16,14 +16,14 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ gbuild.o #qt code -QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \ - qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfile.o \ +QOBJS=qtextcodec.o qutfcodec.o qstring.o qstringbuilder.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \ + qarraydata.o qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfiledevice.o qfile.o \ qfilesystementry.o qfilesystemengine_unix.o qfilesystemengine.o qfilesystemiterator_unix.o \ qfsfileengine_unix.o qfsfileengine.o \ qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \ qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \ qmap.o qmetatype.o qsettings.o qsystemerror.o qlibraryinfo.o qvariant.o qvsnprintf.o \ - qlocale.o qlocale_tools.o qlocale_unix.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o \ + qlocale.o qlocale_tools.o qlocale_unix.o qlinkedlist.o qnumeric.o qcryptographichash.o \ qxmlstream.o qxmlutils.o qlogging.o \ $(QTOBJS) @@ -39,10 +39,12 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge generators/integrity/gbuild.cpp \ $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \ $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \ + $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp \ $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \ $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp \ $(SOURCE_PATH)/src/corelib/global/qglobal.cpp $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp \ + $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp\ + $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp \ $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \ $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp \ $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_mac.cpp \ @@ -55,7 +57,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge $(SOURCE_PATH)/src/corelib/io/qdir.cpp $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \ $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp \ $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \ - $(SOURCE_PATH)/src/corelib/global/qconfig.cpp $(SOURCE_PATH)/src/corelib/io/qurl.cpp \ + $(SOURCE_PATH)/src/corelib/global/qconfig.cpp \ + $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp \ @@ -78,7 +81,7 @@ CPPFLAGS = -g -I$(QMKSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$ -I$(BUILD_PATH)/src/corelib/global \ -I$(SOURCE_PATH)/tools/shared \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ -DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS) @@ -197,6 +200,9 @@ qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qglobal.cpp +qarraydata.o: $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp + qbytearray.o: $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp @@ -212,9 +218,6 @@ qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp -qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp - $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp - qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp @@ -224,6 +227,9 @@ qtextcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp +qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp + qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp @@ -245,6 +251,9 @@ qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfile.cpp +qfiledevice.o: $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp + qfilesystementry.o: $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 4e169f3270..780fd2a850 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -38,7 +38,7 @@ CFLAGS_BARE = -c -Fo./ \ -I$(BUILD_PATH)\src\corelib\global \ -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ -I$(SOURCE_PATH)\tools\shared \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL \ -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_BOOTSTRAPPED CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) @@ -78,12 +78,14 @@ QTOBJS= \ qfilesystemiterator_win.obj \ qfsfileengine.obj \ qfsfileengine_iterator.obj \ + qarraydata.obj \ qbytearray.obj \ qvsnprintf.obj \ qbytearraymatcher.obj \ qdatetime.obj \ qdir.obj \ qdiriterator.obj \ + qfiledevice.obj \ qfile.obj \ qtemporaryfile.obj \ qabstractfileengine.obj \ @@ -105,6 +107,7 @@ QTOBJS= \ qutfcodec.obj \ qstring.obj \ qstringlist.obj \ + qstringbuilder.obj \ qsystemerror.obj \ qtextstream.obj \ qdatastream.obj \ @@ -113,7 +116,6 @@ QTOBJS= \ qsettings.obj \ qlibraryinfo.obj \ qvariant.obj \ - qurl.obj \ qsettings_win.obj \ qmetatype.obj \ qxmlstream.obj \ diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 95108b351b..1966a8bbbc 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -49,7 +49,7 @@ CFLAGS = -c -o$@ -O \ -I$(SOURCE_PATH)/mkspecs/win32-g++ \ -I$(SOURCE_PATH)/tools/shared \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT \ - -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ + -DQT_NODLL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_BOOTSTRAPPED CXXFLAGS = $(CFLAGS) @@ -74,6 +74,7 @@ endif QTOBJS= \ qbitarray.o \ qbuffer.o \ + qarraydata.o \ qbytearray.o \ qcryptographichash.o \ qvsnprintf.o \ @@ -82,6 +83,7 @@ QTOBJS= \ qdatetime.o \ qdir.o \ qdiriterator.o \ + qfiledevice.o \ qfile.o \ qtemporaryfile.o \ qfileinfo.o \ @@ -109,12 +111,12 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qstringbuilder.o \ qsystemerror.o \ qsystemlibrary.o \ qtextstream.o \ quuid.o \ qvector.o \ - qurl.o \ qsettings.o \ qsettings_win.o \ qvariant.o \ diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 770a1ad34e..841e11534b 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1928,7 +1928,7 @@ ProjectBuilderMakefileGenerator::writeSettings(QString var, QStringList vals, in { QString ret; const QString quote = (flags & SettingsNoQuote) ? "" : "\""; - const QString escape_quote = quote.isEmpty() ? "" : "\\" + quote; + const QString escape_quote = quote.isEmpty() ? "" : QString("\\" + quote); QString newline = "\n"; for(int i = 0; i < indent_level; ++i) newline += "\t"; diff --git a/qmake/project.cpp b/qmake/project.cpp index 8e4b1744b9..c491e9b1b7 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1026,7 +1026,7 @@ QMakeProject::parse(const QString &t, QHash<QString, QStringList> &place, int nu debug_msg(1, "Project Parser: %s:%d : Entering block %d (%d). [%s]", parser.file.toLatin1().constData(), parser.line_no, scope_blocks.count(), scope_failed, s.toLatin1().constData()); } else if(iterator) { - iterator->parselist.append(var+s.mid(d_off)); + iterator->parselist.append(QString(var+s.mid(d_off))); bool ret = iterator->exec(this, place); delete iterator; return ret; diff --git a/qmake/qmake.pri b/qmake/qmake.pri index fb530a6380..cfa0c1359d 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -1,7 +1,7 @@ CONFIG += depend_includepath SKIP_DEPENDS += qconfig.h qmodules.h -DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \ +DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_COMPRESS QT_NO_UNICODETABLES \ QT_NO_GEOM_VARIANT QT_NO_DATASTREAM #qmake code @@ -35,12 +35,14 @@ bootstrap { #Qt code SOURCES+= \ qbitarray.cpp \ qbuffer.cpp \ + qarraydata.cpp \ qbytearray.cpp \ qbytearraymatcher.cpp \ qcryptographichash.cpp \ qdatetime.cpp \ qdir.cpp \ qdiriterator.cpp \ + qfiledevice.cpp \ qfile.cpp \ qabstractfileengine.cpp \ qfileinfo.cpp \ @@ -66,7 +68,6 @@ bootstrap { #Qt code qstringlist.cpp \ qtemporaryfile.cpp \ qtextstream.cpp \ - qurl.cpp \ quuid.cpp \ qsettings.cpp \ qlibraryinfo.cpp \ @@ -81,7 +82,10 @@ bootstrap { #Qt code HEADERS+= \ qbitarray.h \ qbuffer.h \ + qarraydata.h \ qbytearray.h \ + qarraydataops.h \ + qarraydatapointer.h \ qbytearraymatcher.h \ qchar.h \ qcryptographichash.h \ @@ -113,7 +117,6 @@ bootstrap { #Qt code qsystemerror_p.h \ qtemporaryfile.h \ qtextstream.h \ - qurl.h \ quuid.h \ qvector.h \ qxmlstream.h \ diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h index 129d8937cb..d1698ec022 100644 --- a/qmake/qmake_pch.h +++ b/qmake/qmake_pch.h @@ -41,6 +41,11 @@ #ifndef QMAKE_PCH_H #define QMAKE_PCH_H +// for rand_s, _CRT_RAND_S must be #defined before #including stdlib.h. +// put it at the beginning so some indirect inclusion doesn't break it +#ifndef _CRT_RAND_S +#define _CRT_RAND_S +#endif #include <qglobal.h> #ifdef Q_OS_WIN # define _POSIX_ |