diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-03-27 11:21:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-29 11:28:41 +0200 |
| commit | fb650b0271b52a31da670d68858b54abfe595bfa (patch) | |
| tree | 7cd01d9bbcc07ffa492b703a23a7bba73b494fb0 /tools | |
| parent | 2d35844ee583175dffd3e4e0bc9916a727598678 (diff) | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/Makefile.mingw | 1 | ||||
| -rw-r--r-- | tools/configure/Makefile.win32 | 2 | ||||
| -rw-r--r-- | tools/configure/configure.pro | 4 |
3 files changed, 7 insertions, 0 deletions
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 \ |