Fix compile errors in configure.exe.
authorJason Barron <jason.barron@digia.com>
Mon, 15 Oct 2012 20:13:58 +0000 (22:13 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 16 Oct 2012 13:29:15 +0000 (15:29 +0200)
qstringmatcher.cpp and qchar.cpp are included in qstring.cpp and
qunicodetables.cpp is included in qchar.cpp so these files should
not be compiled as standalone objects.

Change-Id: I323e0878af28b9e5fb2f659fb8077347b93fa439
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
tools/configure/configure.pro

index 9148199..c970880 100644 (file)
@@ -81,7 +81,6 @@ 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 \
            $$QT_SOURCE_TREE/src/corelib/tools/qlist.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qlocale.cpp \
@@ -118,8 +117,6 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qregexp.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qstring.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qstringmatcher.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qvsnprintf.cpp \
            $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \
            $$QT_SOURCE_TREE/src/corelib/kernel/qsystemerror.cpp \