diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-17 20:00:03 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-17 20:00:03 +0200 |
| commit | 91a1f7a1c408052b1d284d6b901819964e338fe5 (patch) | |
| tree | df7103f0ea0cb9d98f4b641d72c0f8b0ebdf2498 /tests/auto/xmlpatterns.pro | |
| parent | 94a3356d5eb7b255d439efe2699bf3a9b025e8eb (diff) | |
| parent | 509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
Diffstat (limited to 'tests/auto/xmlpatterns.pro')
| -rw-r--r-- | tests/auto/xmlpatterns.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/xmlpatterns.pro b/tests/auto/xmlpatterns.pro index 923f2c4804..b9244d62a7 100644 --- a/tests/auto/xmlpatterns.pro +++ b/tests/auto/xmlpatterns.pro @@ -36,6 +36,7 @@ SUBDIRS=\ xmlpatternsdiagnosticsts.depends = xmlpatternssdk xmlpatternsview.depends = xmlpatternssdk xmlpatternsxslts.depends = xmlpatternssdk +xmlpatternsxqts.depends = xmlpatternssdk xmlpatternsschemats.depends = xmlpatternssdk xmlpatternsxqts.depends = xmlpatternssdk |