diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/Makefile.unix | 12 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
-rw-r--r-- | qmake/Makefile.win32-g++ | 2 | ||||
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
-rw-r--r-- | qmake/project.cpp | 2 | ||||
-rw-r--r-- | qmake/qmake.pri | 1 |
6 files changed, 17 insertions, 4 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 03a8597eff..a263fb4022 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -16,8 +16,8 @@ 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 \ + 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 \ @@ -39,6 +39,7 @@ 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 \ @@ -56,6 +57,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge $(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/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 \ @@ -224,6 +226,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 +250,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..2379473af0 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -84,6 +84,7 @@ QTOBJS= \ qdatetime.obj \ qdir.obj \ qdiriterator.obj \ + qfiledevice.obj \ qfile.obj \ qtemporaryfile.obj \ qabstractfileengine.obj \ @@ -105,6 +106,7 @@ QTOBJS= \ qutfcodec.obj \ qstring.obj \ qstringlist.obj \ + qstringbuilder.obj \ qsystemerror.obj \ qtextstream.obj \ qdatastream.obj \ diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 95108b351b..8754e10b29 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -82,6 +82,7 @@ QTOBJS= \ qdatetime.o \ qdir.o \ qdiriterator.o \ + qfiledevice.o \ qfile.o \ qtemporaryfile.o \ qfileinfo.o \ @@ -109,6 +110,7 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qstringbuilder.o \ qsystemerror.o \ qsystemlibrary.o \ qtextstream.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 b82b793319..1f936a04c2 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..b8b9d43035 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -41,6 +41,7 @@ bootstrap { #Qt code qdatetime.cpp \ qdir.cpp \ qdiriterator.cpp \ + qfiledevice.cpp \ qfile.cpp \ qabstractfileengine.cpp \ qfileinfo.cpp \ |