Merge master <-> api_changes

[profile/ivi/qtdeclarative.git] / src / imports / testlib / testlib.pro

diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index 7e8f601..dfb23ce 100644 (file)
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -4,13 +4,13 @@ include(../qimportbase.pri)
 
 CONFIG += qt plugin
 
-QT += declarative quick qmltest qmltest-private v8-private declarative-private core-private testlib
+QT += qml quick qmltest qmltest-private v8-private qml-private core-private testlib
 
 SOURCES += main.cpp
 
 OTHER_FILES += testlib.json
 
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+DESTDIR = $$QT.qml.imports/$$TARGETPATH
 
 target.path += $$[QT_INSTALL_IMPORTS]/QtTest
 OTHER_IMPORT_FILES = \
@@ -24,7 +24,7 @@ otherImportFiles.files += $$OTHER_IMPORT_FILES
 otherImportFiles.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 copy2build.input = OTHER_IMPORT_FILES
-copy2build.output = $$QT.declarative.imports/$$TARGETPATH/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+copy2build.output = $$QT.qml.imports/$$TARGETPATH/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
 
 
 INSTALLS += target otherImportFiles