diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-18 06:34:18 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-18 06:34:18 (GMT) |
| commit | fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf (patch) | |
| tree | aa2ba4ce64d047d73c29ab0616e8a89d352c3abd /tools/configure | |
| parent | d24029e3d4639f1300e7a68858936911df969f69 (diff) | |
| parent | 572e165dcb8cc8fcdfaa4ab9bdab050f6a6cc173 (diff) | |
| download | Qt-fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf.zip Qt-fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf.tar.gz Qt-fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
doc/src/examples.qdoc
doc/src/plugins-howto.qdoc
doc/src/topics.qdoc
examples/phonon/musicplayer/mainwindow.cpp
src/3rdparty/freetype/src/base/ftobjs.c
src/corelib/global/qglobal.h
src/corelib/tools/qalgorithms.h
src/corelib/tools/qshareddata.cpp
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/tools.pri
src/corelib/xml/qxmlstream.h
src/gui/painting/painting.pri
src/gui/widgets/qdatetimeedit.cpp
tests/auto/qdesktopservices/qdesktopservices.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qtextcodec/test/test.pro
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configure.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 14a5a95..c87fd11 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -65,7 +65,7 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.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/qlistdata.cpp \ + $$QT_SOURCE_TREE/src/corelib/tools/qlist.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qlocale.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qvector.cpp \ $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \ |