diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 18:09:27 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 18:09:27 +0100 |
commit | 7ee944a14582cd7202b4a8e94adc06e7ae5855a6 (patch) | |
tree | 0684ab4a4e02dc72c2e1f5bc72baaf55f0d0310f /tests/auto/xmlpatternsxqts/test/test.pro | |
parent | cd58bc13a4a37543d76a79b3cee7cd95bde0a14b (diff) | |
parent | 12d14efb2e1df3188c7c0001492f24fd193a11a9 (diff) |
Merge commit 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'tests/auto/xmlpatternsxqts/test/test.pro')
-rw-r--r-- | tests/auto/xmlpatternsxqts/test/test.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/xmlpatternsxqts/test/test.pro b/tests/auto/xmlpatternsxqts/test/test.pro index 603ae65b26..a69838af5e 100644 --- a/tests/auto/xmlpatternsxqts/test/test.pro +++ b/tests/auto/xmlpatternsxqts/test/test.pro @@ -24,5 +24,3 @@ win32 { else: DESTDIR = ../release } TARGET = tst_xmlpatternsxqts - -include (../../xmlpatterns.pri) |