diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-12 10:16:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-12 10:16:03 +0200 |
| commit | c45cd4a943dfbbc9c54f65ec2ab5250e9b5ba1cb (patch) | |
| tree | 88031e0928c9b4b0bf01d72a89c90f3e1406c593 /tests/auto/blackbox/testdata-qt | |
| parent | adcadd2a06b906685bf0a2687dd5ab902f3b0ebf (diff) | |
| parent | 2440b19b288096e1601674de2ac15c560af469cd (diff) | |
Merge 1.12 into master
Change-Id: I056a96c062881c2a07ec15b1803efa9c9aa1a02a
Diffstat (limited to 'tests/auto/blackbox/testdata-qt')
| -rw-r--r-- | tests/auto/blackbox/testdata-qt/qrc/i.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-qt/qrc/test.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-qt/qrc/i.qbs b/tests/auto/blackbox/testdata-qt/qrc/i.qbs index 71e7524e1..c005490c4 100644 --- a/tests/auto/blackbox/testdata-qt/qrc/i.qbs +++ b/tests/auto/blackbox/testdata-qt/qrc/i.qbs @@ -11,7 +11,7 @@ Project { files: [ "bla.cpp", "bla.qrc", - "stuff.txt" + //"test.cpp", ] } } diff --git a/tests/auto/blackbox/testdata-qt/qrc/test.cpp b/tests/auto/blackbox/testdata-qt/qrc/test.cpp new file mode 100644 index 000000000..7da700fd1 --- /dev/null +++ b/tests/auto/blackbox/testdata-qt/qrc/test.cpp @@ -0,0 +1 @@ +void test() {} |