diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-06 12:38:51 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-10 15:55:52 +0100 |
| commit | 32b506d1db1f8cee748a27b548ba8208f2928058 (patch) | |
| tree | 2d5b23baafe22ccc3518719f8f5d19bb846b2b61 /tests/auto/corelib/serialization/qtextstream/test/test.pro | |
| parent | 2cb1db64370989fffeec313c196fe573c479e6aa (diff) | |
| parent | c0948d508e7179e2e23c893ba6152c40400de060 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.11
Conflicts:
src/corelib/tools/qvarlengtharray.qdoc
src/corelib/tools/qvector.qdoc
Resolved documentation changes in favor of 017569f702b6dd0,
which keeps the move overloads along with its const-ref sibling.
Change-Id: I0835b0b3211a418e5e50defc4cf315f0964fab79
Diffstat (limited to 'tests/auto/corelib/serialization/qtextstream/test/test.pro')
| -rw-r--r-- | tests/auto/corelib/serialization/qtextstream/test/test.pro | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/qtextstream/test/test.pro b/tests/auto/corelib/serialization/qtextstream/test/test.pro new file mode 100644 index 0000000000..3dcfa0b414 --- /dev/null +++ b/tests/auto/corelib/serialization/qtextstream/test/test.pro @@ -0,0 +1,26 @@ +CONFIG += testcase +TARGET = ../tst_qtextstream +QT = core network testlib +SOURCES = ../tst_qtextstream.cpp +RESOURCES += ../qtextstream.qrc + +win32 { + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qtextstream + } else { + TARGET = ../../release/tst_qtextstream + } +} + +TESTDATA += \ + ../rfc3261.txt \ + ../shift-jis.txt \ + ../task113817.txt \ + ../qtextstream.qrc \ + ../tst_qtextstream.cpp \ + ../resources \ + ../BLACKLIST + +builtin_testdata { + DEFINES += BUILTIN_TESTDATA +} |