diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
| commit | 9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d (patch) | |
| tree | 22f60abbc45a5ef8e1beab0af8d9980134d914ad /tools/configure | |
| parent | f792bae5b13ad68f846a2be1f002d8376f2daef8 (diff) | |
| parent | af98f27a847688e53ab1d34b4a9c04bdc63fe3e1 (diff) | |
| download | Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.zip Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.gz Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
doc/src/index.qdoc
doc/src/topics.qdoc
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
tests/auto/auto.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 eeec62a..06e9fe0 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -62,7 +62,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 \ |