diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
commit | 190fa97c83472863fd886e86f626ab8196ed51b3 (patch) | |
tree | 49edb9f6a41d6c999c9bb43ae28911a8e7212757 /tests/auto/xml | |
parent | 3aa163491c9c8f28c88ac87cafc6418f2c0e46c5 (diff) | |
parent | 5971e0918757737425151c39a5f81a238663a17a (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/widgets/doc/src/addressbook-fr.qdoc
Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
Diffstat (limited to 'tests/auto/xml')
-rw-r--r-- | tests/auto/xml/dom/qdom/qdom.pro | 1 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro | 5 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/xml/dom/qdom/qdom.pro b/tests/auto/xml/dom/qdom/qdom.pro index db19a8ba89..3248b8e0e2 100644 --- a/tests/auto/xml/dom/qdom/qdom.pro +++ b/tests/auto/xml/dom/qdom/qdom.pro @@ -3,7 +3,6 @@ TARGET = tst_qdom SOURCES += tst_qdom.cpp QT = core xml testlib -QT -= gui wince* { wince*|qt_not_deployed { diff --git a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro index a8bf834074..8846ae5e4a 100644 --- a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro +++ b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro @@ -1,7 +1,4 @@ CONFIG += testcase TARGET = tst_qxmlinputsource SOURCES += tst_qxmlinputsource.cpp -QT += core xml network testlib -QT -= gui - - +QT = core xml network testlib diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro index 981f506c6d..349b976f58 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro @@ -6,7 +6,6 @@ HEADERS += parser/parser.h SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp CONFIG += no_batch -QT += network xml testlib -QT -= gui +QT = core network xml testlib TESTDATA += encodings/* xmldocs/* |