Changeset 769 for trunk/tools/configure/configure.pro

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/configure/configure.pro (modified) (4 diffs)

trunk/tools/configure/configure.pro

@@ -4 +4 @@
 CONFIG   += console flat
 CONFIG   -= moc qt
-DEFINES  = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_BUILD_QMAKE QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
-
+DEFINES  = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
+DEFINES  += QT_BOOTSTRAPPED
 
 win32 : LIBS += -lole32 -ladvapi32
@@ -28 +28 @@
            $$QT_BUILD_TREE/include \
            $$QT_BUILD_TREE/include/QtCore \
+           $$QT_BUILD_TREE/tools/shared
 
 HEADERS  = configureapp.h environment.h tools.h\
@@ -59 +60 @@
            $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qstringmatcher.h \
-           $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables_p.h
+           $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables_p.h \
+           $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.h \
+           $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils_p.h \
+           $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.h \
+           $$QT_SOURCE_TREE/tools/shared/windows/registry.h
 
 
@@ -103 +108 @@
            $$QT_SOURCE_TREE/src/corelib/tools/qrect.cpp \
            $$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \
-           $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp
+           $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp \
+           $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.cpp \
+           $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils.cpp \
+           $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \
+           $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp
 
 win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp