diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 15:49:08 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 15:49:08 +0000 |
| commit | 7bc1d6effaae8f5aa1bef92cb1094ec3b3f4fb95 (patch) | |
| tree | cde8deeea717fc25d64640d96cf13a4fd44d9db1 /tests/auto/gui/painting/qpainter/qpainter.pro | |
| parent | 2aeb2bcef48d7bca2186c262dde433737956a539 (diff) | |
| parent | 305dd1b61f657474d751cc3b24f58249ec21b61b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11
Diffstat (limited to 'tests/auto/gui/painting/qpainter/qpainter.pro')
| -rw-r--r-- | tests/auto/gui/painting/qpainter/qpainter.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/painting/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro index 0d3899ee92..9ccf8f20ba 100644 --- a/tests/auto/gui/painting/qpainter/qpainter.pro +++ b/tests/auto/gui/painting/qpainter/qpainter.pro @@ -9,7 +9,7 @@ SOURCES += tst_qpainter.cpp TESTDATA += drawEllipse/* drawLine_rop_bitmap/* drawPixmap_rop/* drawPixmap_rop_bitmap/* \ task217400.png -android { +android:!android-embedded { RESOURCES += \ testdata.qrc } |