diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-21 08:46:34 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-21 08:46:34 (GMT) |
| commit | a3c66f6898c560820ff5768159e4af1323219161 (patch) | |
| tree | 143fa35cd328a2d9fb4690d703050d01eb407bbb /config.profiles/harmattan/tests/testsuite_footer.txt | |
| parent | 51c2b10379b0bbed5804f0f8e2eca82e5bb4d0bf (diff) | |
| parent | 86ceda033eda6bd615134f71b9850081a0c808c9 (diff) | |
| download | Qt-a3c66f6898c560820ff5768159e4af1323219161.zip Qt-a3c66f6898c560820ff5768159e4af1323219161.tar.gz Qt-a3c66f6898c560820ff5768159e4af1323219161.tar.bz2 | |
Merge remote branch 'qt/master' into staging-master
Conflicts:
src/gui/image/qpnghandler.cpp
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'config.profiles/harmattan/tests/testsuite_footer.txt')
| -rw-r--r-- | config.profiles/harmattan/tests/testsuite_footer.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.profiles/harmattan/tests/testsuite_footer.txt b/config.profiles/harmattan/tests/testsuite_footer.txt new file mode 100644 index 0000000..8c71c93 --- /dev/null +++ b/config.profiles/harmattan/tests/testsuite_footer.txt @@ -0,0 +1,2 @@ + </suite> +</testdefinition> |