diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 09:56:54 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 09:56:54 +0200 |
| commit | a46c03c0737ce5e2e5b231e448e3fc112ef1fc59 (patch) | |
| tree | 77f8bc134b8eb4515947d219af4095c2865767cc /tests/auto/blackbox/testdata-qt | |
| parent | 9788db406f1a3317e3904cb910eab4d518d9cf8b (diff) | |
| parent | d994e54712efb69225d73d93fc57b89a3d39cacb (diff) | |
Merge 1.12 into master
Change-Id: I72bbda4537a65bc525afc38a3d280f3c23940c12
Diffstat (limited to 'tests/auto/blackbox/testdata-qt')
| -rw-r--r-- | tests/auto/blackbox/testdata-qt/qrc/bla.cpp | 13 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-qt/qrc/bla.qrc | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-qt/qrc/subdir/dummy.txt | 0 |
3 files changed, 13 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-qt/qrc/bla.cpp b/tests/auto/blackbox/testdata-qt/qrc/bla.cpp index e04f873a6..5375b33b6 100644 --- a/tests/auto/blackbox/testdata-qt/qrc/bla.cpp +++ b/tests/auto/blackbox/testdata-qt/qrc/bla.cpp @@ -26,8 +26,19 @@ ** ****************************************************************************/ +#include <QFileInfo> + int main() { - return 3; + QFileInfo f(":/stuff.txt"); + if (!f.exists()) + return 1; + if (!f.isFile()) + return 2; + QFileInfo d(":/subdir"); + if (!d.exists()) + return 3; + if (!d.isDir()) + return 4; } diff --git a/tests/auto/blackbox/testdata-qt/qrc/bla.qrc b/tests/auto/blackbox/testdata-qt/qrc/bla.qrc index 46c93847e..cad4c6cd3 100644 --- a/tests/auto/blackbox/testdata-qt/qrc/bla.qrc +++ b/tests/auto/blackbox/testdata-qt/qrc/bla.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> <file>stuff.txt</file> + <file>subdir/</file> </qresource> </RCC> diff --git a/tests/auto/blackbox/testdata-qt/qrc/subdir/dummy.txt b/tests/auto/blackbox/testdata-qt/qrc/subdir/dummy.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/blackbox/testdata-qt/qrc/subdir/dummy.txt |