diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
| commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
| tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /tests/global/global.cfg | |
| parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'tests/global/global.cfg')
| -rw-r--r-- | tests/global/global.cfg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/global/global.cfg b/tests/global/global.cfg index b2620f4bd6..0b1ac100c9 100644 --- a/tests/global/global.cfg +++ b/tests/global/global.cfg @@ -10,5 +10,6 @@ <module name="QtSql" qtname="sql"/> <module name="QtTest" qtname="testlib"/> <module name="QtWidgets" qtname="widgets"/> +<module name="QtXml" qtname="xml"/> </modules> </config> |