tests: fix private header inclusion problems in qtxmlpatterns tests

Most xmlpatterns tests use private QtCore and QtXmlPatterns headers,
so `QT += core-private xmlpatterns-private' is required.

In Qt5, $$QT_SOURCE_TREE refers to the source tree of `qtbase'.
Change it to `$$QT.xmlpatterns.sources'.

Reviewed-by: Jason McDonald
Change-Id: I711585819d2ce5a8b151e76ed79fa13be1f29379

diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri
index 67a2d44..d3e9625 100644 (file)
--- a/tests/auto/xmlpatterns.pri
+++ b/tests/auto/xmlpatterns.pri
@@ -1,5 +1,5 @@
 DEFINES += QTEST_XMLPATTERNS
-QT += xmlpatterns
+QT += core-private xmlpatterns xmlpatterns-private
 
 wince*: {
     patternsdk.files = $$QT_BUILD_TREE/lib/QtXmlPatternsSDK*.dll
@@ -18,17 +18,18 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
     else:       XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug
 }
 
+XMLPATTERNS_SOURCES = $$QT.xmlpatterns.sources
 INCLUDEPATH += \
-               $$QT_SOURCE_TREE/src/xmlpatterns/acceltree \
-               $$QT_SOURCE_TREE/src/xmlpatterns/api \
-               $$QT_SOURCE_TREE/src/xmlpatterns/data \
-               $$QT_SOURCE_TREE/src/xmlpatterns/environment \
-               $$QT_SOURCE_TREE/src/xmlpatterns/expr \
-               $$QT_SOURCE_TREE/src/xmlpatterns/functions \
-               $$QT_SOURCE_TREE/src/xmlpatterns/iterators \
-               $$QT_SOURCE_TREE/src/xmlpatterns/janitors \
-               $$QT_SOURCE_TREE/src/xmlpatterns/parser \
-               $$QT_SOURCE_TREE/src/xmlpatterns/projection \
-               $$QT_SOURCE_TREE/src/xmlpatterns/schema \
-               $$QT_SOURCE_TREE/src/xmlpatterns/type \
-               $$QT_SOURCE_TREE/src/xmlpatterns/utils
+               $$XMLPATTERNS_SOURCES/acceltree \
+               $$XMLPATTERNS_SOURCES/api \
+               $$XMLPATTERNS_SOURCES/data \
+               $$XMLPATTERNS_SOURCES/environment \
+               $$XMLPATTERNS_SOURCES/expr \
+               $$XMLPATTERNS_SOURCES/functions \
+               $$XMLPATTERNS_SOURCES/iterators \
+               $$XMLPATTERNS_SOURCES/janitors \
+               $$XMLPATTERNS_SOURCES/parser \
+               $$XMLPATTERNS_SOURCES/projection \
+               $$XMLPATTERNS_SOURCES/schema \
+               $$XMLPATTERNS_SOURCES/type \
+               $$XMLPATTERNS_SOURCES/utils