From fb650b0271b52a31da670d68858b54abfe595bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 27 Mar 2012 11:21:27 +0200 Subject: Compile QArrayData in bootstrap phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change will be needed during migration from QByteArrayData to QArrayData. Change-Id: I0c8d6f9ed3ef7c33af62736af55259a8f9a70c0f Reviewed-by: João Abecasis Reviewed-by: Oswald Buddenhagen --- qmake/Makefile.unix | 8 ++++++-- qmake/Makefile.win32 | 1 + qmake/Makefile.win32-g++ | 1 + qmake/qmake.pri | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 03defe26ea..773c6a8c08 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -17,7 +17,7 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ #qt code 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 \ + 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 \ @@ -43,7 +43,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge $(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 \ @@ -199,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 diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 4365f114ab..946873ada9 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -78,6 +78,7 @@ QTOBJS= \ qfilesystemiterator_win.obj \ qfsfileengine.obj \ qfsfileengine_iterator.obj \ + qarraydata.obj \ qbytearray.obj \ qvsnprintf.obj \ qbytearraymatcher.obj \ diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 65a6b294a1..4d97887423 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -74,6 +74,7 @@ endif QTOBJS= \ qbitarray.o \ qbuffer.o \ + qarraydata.o \ qbytearray.o \ qcryptographichash.o \ qvsnprintf.o \ diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 9320456b9e..e33ce1e6db 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -35,6 +35,7 @@ bootstrap { #Qt code SOURCES+= \ qbitarray.cpp \ qbuffer.cpp \ + qarraydata.cpp \ qbytearray.cpp \ qbytearraymatcher.cpp \ qcryptographichash.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 \ -- cgit v1.2.3