summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jason.barron@digia.com>2012-10-15 22:13:58 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-16 15:29:15 +0200
commitc92ceb179f609de4d3c8ec9433c9329e48214224 (patch)
treee8535f336a1b0d69874a4debd6a43c336422f8ee
parentc3b939818af214392505c58b93d5f8df46fa09d8 (diff)
Fix compile errors in configure.exe.
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>
-rw-r--r--tools/configure/configure.pro3
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 9148199d24..c970880d8c 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -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 \