Post merge fixes

Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

2 files changed, 26 insertions, 31 deletions

diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 772848eb11..eafd135207 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -124,7 +124,6 @@ qt_add_module(Quick
         scenegraph/util/qsgninepatchnode.cpp scenegraph/util/qsgninepatchnode.h
         scenegraph/util/qsgplaintexture.cpp scenegraph/util/qsgplaintexture_p.h
         scenegraph/util/qsgrectanglenode.cpp scenegraph/util/qsgrectanglenode.h
-        scenegraph/util/qsgrhinativetextureimporter.cpp scenegraph/util/qsgrhinativetextureimporter_p.h
         scenegraph/util/qsgsimplematerial.cpp scenegraph/util/qsgsimplematerial.h
         scenegraph/util/qsgsimplerectnode.cpp scenegraph/util/qsgsimplerectnode.h
         scenegraph/util/qsgsimpletexturenode.cpp scenegraph/util/qsgsimpletexturenode.h
@@ -165,7 +164,6 @@ qt_add_module(Quick
         util/qquicktransition.cpp util/qquicktransition_p.h
         util/qquicktransitionmanager.cpp
         util/qquicktransitionmanager_p_p.h
-        util/qquickutilmodule.cpp util/qquickutilmodule_p.h
         util/qquickvalidator.cpp util/qquickvalidator_p.h
         util/qquickvaluetypes.cpp util/qquickvaluetypes_p.h
     DEFINES
@@ -348,6 +346,12 @@ if(ANDROID)
     )
 endif()
 
+#### Keys ignored in scope 1:.:.:quick.pro:<TRUE>:
+# IMPORT_VERSION = "2.15"
+# QMLTYPES_FILENAME = "plugins.qmltypes"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick.2"
+# QML_IMPORT_NAME = "QtQuick"
+
 ## Scopes:
 #####################################################################
 
@@ -581,6 +585,9 @@ qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent
         handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h
         handlers/qquickwheelhandler_p_p.h
 )
+
+
+qt_create_tracepoints(Quick qtquick.tracepoints)
 qt_add_docs(Quick
     doc/qtquick.qdocconf
 )
diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake
index 26213be687..1685ca63ef 100644
--- a/src/quick/configure.cmake
+++ b/src/quick/configure.cmake
@@ -11,109 +11,97 @@
 #### Tests
 
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/d3d12/CMakeLists.txt")
-    qt_config_compile_test("d3d12"
-                           LABEL "Direct3D 12"
-                           PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/d3d12")
-endif()
-
 
 #### Features
 
-qt_feature("d3d12" PUBLIC
-    SECTION "Qt Quick"
-    LABEL "Direct3D 12"
-    PURPOSE "Provides a Direct3D 12 backend for the scenegraph."
-    CONDITION TEST_d3d12
-)
-qt_feature("quick_animatedimage" PRIVATE
+qt_feature("quick-animatedimage" PRIVATE
     SECTION "Qt Quick"
     LABEL "AnimatedImage item"
     PURPOSE "Provides the AnimatedImage item."
     CONDITION TARGET Qt::Gui AND QT_FEATURE_movie
 )
-qt_feature("quick_canvas" PRIVATE
+qt_feature("quick-canvas" PRIVATE
     SECTION "Qt Quick"
     LABEL "Canvas item"
     PURPOSE "Provides the Canvas item."
     CONDITION QT_FEATURE_quick_path
 )
-qt_feature("quick_designer" PRIVATE
+qt_feature("quick-designer" PRIVATE
     SECTION "Qt Quick"
     LABEL "Support for Qt Quick Designer"
     PURPOSE "Provides support for the Qt Quick Designer in Qt Creator."
 )
-qt_feature("quick_flipable" PRIVATE
+qt_feature("quick-flipable" PRIVATE
     SECTION "Qt Quick"
     LABEL "Flipable item"
     PURPOSE "Provides the Flipable item."
 )
-qt_feature("quick_gridview" PRIVATE
+qt_feature("quick-gridview" PRIVATE
     SECTION "Qt Quick"
     LABEL "GridView item"
     PURPOSE "Provides the GridView item."
     CONDITION QT_FEATURE_qml_delegate_model
 )
-qt_feature("quick_itemview" PRIVATE
+qt_feature("quick-itemview" PRIVATE
     LABEL "ItemView item"
     CONDITION QT_FEATURE_quick_gridview OR QT_FEATURE_quick_listview OR QT_FEATURE_quick_tableview
 )
-qt_feature("quick_viewtransitions" PRIVATE
+qt_feature("quick-viewtransitions" PRIVATE
     LABEL "Transitions required for ItemViews and Positioners"
     CONDITION QT_FEATURE_quick_itemview OR QT_FEATURE_quick_positioners
 )
-qt_feature("quick_listview" PRIVATE
+qt_feature("quick-listview" PRIVATE
     SECTION "Qt Quick"
     LABEL "ListView item"
     PURPOSE "Provides the ListView item."
     CONDITION QT_FEATURE_qml_delegate_model
 )
-qt_feature("quick_tableview" PRIVATE
+qt_feature("quick-tableview" PRIVATE
     SECTION "Qt Quick"
     LABEL "TableView item"
     PURPOSE "Provides the TableView item."
     CONDITION QT_FEATURE_qml_table_model
 )
-qt_feature("quick_particles" PRIVATE
+qt_feature("quick-particles" PRIVATE
     SECTION "Qt Quick"
     LABEL "Particle support"
     PURPOSE "Provides a particle system."
     CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl
 )
-qt_feature("quick_path" PRIVATE
+qt_feature("quick-path" PRIVATE
     SECTION "Qt Quick"
     LABEL "Path support"
     PURPOSE "Provides Path elements."
     CONDITION QT_FEATURE_quick_shadereffect
 )
-qt_feature("quick_pathview" PRIVATE
+qt_feature("quick-pathview" PRIVATE
     SECTION "Qt Quick"
     LABEL "PathView item"
     PURPOSE "Provides the PathView item."
     CONDITION ( QT_FEATURE_qml_delegate_model ) AND ( QT_FEATURE_quick_path )
 )
-qt_feature("quick_positioners" PRIVATE
+qt_feature("quick-positioners" PRIVATE
     SECTION "Qt Quick"
     LABEL "Positioner items"
     PURPOSE "Provides Positioner items."
 )
-qt_feature("quick_repeater" PRIVATE
+qt_feature("quick-repeater" PRIVATE
     SECTION "Qt Quick"
     LABEL "Repeater item"
     PURPOSE "Provides the Repeater item."
     CONDITION QT_FEATURE_qml_delegate_model
 )
-qt_feature("quick_shadereffect" PRIVATE
+qt_feature("quick-shadereffect" PRIVATE
     SECTION "Qt Quick"
     LABEL "ShaderEffect item"
     PURPOSE "Provides Shader effects."
 )
-qt_feature("quick_sprite" PRIVATE
+qt_feature("quick-sprite" PRIVATE
     SECTION "Qt Quick"
     LABEL "Sprite item"
     PURPOSE "Provides the Sprite item."
 )
-qt_feature("quick_draganddrop" PUBLIC
+qt_feature("quick-draganddrop" PUBLIC
     SECTION "Qt Quick"
     LABEL "Drag & Drop"
     PURPOSE "Drag and drop support for Qt Quick"