diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 11:43:13 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 11:43:13 +0200 |
| commit | 84294f47e55073914bcbcdbaf85df1a0e2e2d845 (patch) | |
| tree | 1166be97fcfcc6a71b9603443ef6360d33aef276 /tests/auto/gui.pro | |
| parent | 80e13f5bd418395bd64396e359a288b748ae1dfb (diff) | |
| parent | 7b10151cb6550fe8060217fad8549950eadd5fca (diff) | |
| download | qt4-tools-84294f47e55073914bcbcdbaf85df1a0e2e2d845.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tests/auto/gui.pro')
| -rw-r--r-- | tests/auto/gui.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 0fc99f3f9b..c94272c034 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -113,6 +113,7 @@ SUBDIRS=\ qmdisubwindow \ qmessagebox \ qmetaobject \ + qmimedata \ qmouseevent_modal \ qmovie \ qnetworkaccessmanager_and_qprogressdialog \ |