Compile QArrayData in bootstrap phase.

This change will be needed during migration from QByteArrayData to
QArrayData.

Change-Id: I0c8d6f9ed3ef7c33af62736af55259a8f9a70c0f
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

8 files changed, 20 insertions, 2 deletions

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 \
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 2fd98071fc..86823d23dc 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -71,6 +71,7 @@ SOURCES += \
            ../../corelib/plugin/quuid.cpp \
            ../../corelib/tools/qbitarray.cpp \
            ../../corelib/tools/qbytearray.cpp \
+           ../../corelib/tools/qarraydata.cpp \
            ../../corelib/tools/qbytearraymatcher.cpp \
            ../../corelib/tools/qdatetime.cpp \
            ../../corelib/tools/qhash.cpp \
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw
index c4255f545f..c09b510bba 100644
--- a/tools/configure/Makefile.mingw
+++ b/tools/configure/Makefile.mingw
@@ -20,6 +20,7 @@ OBJECTS = \
     configureapp.o \
     environment.o \
     tools.o \
+    qarraydata.o \
     qbytearray.o \
     qbytearraymatcher.o \
     qhash.o \
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32
index 9d38f261f8..47e7b07363 100644
--- a/tools/configure/Makefile.win32
+++ b/tools/configure/Makefile.win32
@@ -18,6 +18,7 @@ OBJECTS = \
     configureapp.obj \
     environment.obj \
     tools.obj \
+    qarraydata.obj \
     qbytearray.obj \
     qbytearraymatcher.obj \
     qhash.obj \
@@ -87,6 +88,7 @@ configureapp.obj: $(CONFSRC)\configureapp.cpp $(CONFSRC)\configureapp.h $(CONFSR
 environment.obj: $(CONFSRC)\environment.cpp $(CONFSRC)\environment.h $(PCH)
 tools.obj: $(CONFSRC)\tools.cpp $(CONFSRC)\tools.h $(PCH)
 registry.obj: $(TOOLSRC)\shared\windows\registry.cpp $(PCH)
+qarraydata.obj: $(CORESRC)\tools\qarraydata.cpp $(PCH)
 qbytearray.obj: $(CORESRC)\tools\qbytearray.cpp $(PCH)
 qbytearraymatcher.obj: $(CORESRC)\tools\qbytearraymatcher.cpp $(PCH)
 qhash.obj: $(CORESRC)\tools\qhash.cpp $(PCH)
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 8aa45bebb4..6852dc086e 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -32,7 +32,10 @@ INCLUDEPATH += \
            $$QT_SOURCE_TREE/tools/shared
 
 HEADERS  = configureapp.h environment.h tools.h\
+           $$QT_SOURCE_TREE/src/corelib/tools/qarraydata.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.h \
+           $$QT_SOURCE_TREE/src/corelib/tools/qarraydatapointer.h \
+           $$QT_SOURCE_TREE/src/corelib/tools/qarraydataops.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qbytearraymatcher.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qchar.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qhash.h \
@@ -76,6 +79,7 @@ HEADERS  = configureapp.h environment.h tools.h\
 
 SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.cpp \
+           $$QT_SOURCE_TREE/src/corelib/tools/qarraydata.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qbytearraymatcher.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qchar.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qhash.cpp \