Re-generate all CMake files

Change-Id: I40dd28da4ba47bd15471b471138900cd22b4e409
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

12 files changed, 89 insertions, 9 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e4e3bb..1c98c3e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 # Generated from src.pro.
 
 add_subdirectory(scxml)
+add_subdirectory(statemachine)
 if(TARGET Qt::Qml)
     add_subdirectory(imports)
 endif()
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 805a479..0c4a585 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -1,3 +1,4 @@
 # Generated from imports.pro.
 
 add_subdirectory(scxmlstatemachine)
+add_subdirectory(statemachine)
diff --git a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt
index 40bb2aa..ddd0877 100644
--- a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt
+++ b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt
@@ -15,12 +15,9 @@ qt_add_qml_module(scxml
         plugin.cpp
         statemachineextended.cpp statemachineextended_p.h
         statemachineloader.cpp statemachineloader_p.h
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::QmlPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Qml
         Qt::Scxml
 )
 
diff --git a/src/imports/scxmlstatemachine/CMakeLists.txt b/src/imports/scxmlstatemachine/CMakeLists.txt
index f0218cd..fd75975 100644
--- a/src/imports/scxmlstatemachine/CMakeLists.txt
+++ b/src/imports/scxmlstatemachine/CMakeLists.txt
@@ -15,12 +15,9 @@ qt_add_qml_module(declarative_scxml # special case
         plugin.cpp
         statemachineextended.cpp statemachineextended_p.h
         statemachineloader.cpp statemachineloader_p.h
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::QmlPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Qml
         Qt::Scxml
 )
 
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index 232f3f2..2f33242 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -10,6 +10,7 @@ qt_add_qml_module(qtqmlstatemachine
     CLASSNAME QtQmlStateMachinePlugin
     SKIP_TYPE_REGISTRATION
     GENERATE_QMLTYPES
+    INSTALL_QMLTYPES
     SOURCES
         childrenprivate.h
         finalstate.cpp finalstate.h
@@ -22,6 +23,7 @@ qt_add_qml_module(qtqmlstatemachine
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::QmlPrivate
+        Qt::StateMachine
 )
 
 #### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>:
diff --git a/src/scxml/.prev_CMakeLists.txt b/src/scxml/.prev_CMakeLists.txt
index 7b9c22f..37fe52b 100644
--- a/src/scxml/.prev_CMakeLists.txt
+++ b/src/scxml/.prev_CMakeLists.txt
@@ -26,6 +26,8 @@ qt_add_module(Scxml
         Qt::CorePrivate
     PUBLIC_LIBRARIES
         Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:scxml.pro:<TRUE>:
@@ -46,6 +48,8 @@ qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel
         Qt::QmlPrivate
     PUBLIC_LIBRARIES
         Qt::Qml
+    PRIVATE_MODULE_INTERFACE
+        Qt::QmlPrivate
 )
 
 #### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND ( NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release) ):
diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt
index 9b686e6..0851f29 100644
--- a/src/scxml/CMakeLists.txt
+++ b/src/scxml/CMakeLists.txt
@@ -26,6 +26,8 @@ qt_add_module(Scxml
         Qt::CorePrivate
     PUBLIC_LIBRARIES
         Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:scxml.pro:<TRUE>:
@@ -46,6 +48,8 @@ qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel
         Qt::QmlPrivate
     PUBLIC_LIBRARIES
         Qt::Qml
+    PRIVATE_MODULE_INTERFACE
+        Qt::QmlPrivate
 )
 
 #### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND ( NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release) ):
diff --git a/src/scxml/configure.cmake b/src/scxml/configure.cmake
index 40cc67a..5629eb9 100644
--- a/src/scxml/configure.cmake
+++ b/src/scxml/configure.cmake
@@ -14,8 +14,11 @@
 
 #### Features
 
-qt_feature("scxml_ecmascriptdatamodel" PUBLIC
+qt_feature("scxml-ecmascriptdatamodel" PUBLIC
     SECTION "SCXML"
     LABEL "ECMAScript data model for QtScxml"
     PURPOSE "Enables the usage of ecmascript data models in SCXML state machines."
 )
+qt_configure_add_summary_section(NAME "Qt Scxml")
+qt_configure_add_summary_entry(ARGS "scxml-ecmascriptdatamodel")
+qt_configure_end_summary_section() # end of "Qt Scxml" section
diff --git a/src/scxml/qt_cmdline.cmake b/src/scxml/qt_cmdline.cmake
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/scxml/qt_cmdline.cmake
diff --git a/src/statemachine/CMakeLists.txt b/src/statemachine/CMakeLists.txt
new file mode 100644
index 0000000..49639c3
--- /dev/null
+++ b/src/statemachine/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from statemachine.pro.
+
+#####################################################################
+## StateMachine Module:
+#####################################################################
+
+qt_add_module(StateMachine
+    SOURCES
+        qabstractstate.cpp qabstractstate.h qabstractstate_p.h
+        qabstracttransition.cpp qabstracttransition.h qabstracttransition_p.h
+        qfinalstate.cpp qfinalstate.h qfinalstate_p.h
+        qhistorystate.cpp qhistorystate.h qhistorystate_p.h
+        qsignaleventgenerator_p.h
+        qsignaltransition.cpp qsignaltransition.h qsignaltransition_p.h
+        qstate.cpp qstate.h qstate_p.h
+        qstatemachine.cpp qstatemachine.h qstatemachine_p.h
+        qstatemachineglobal.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(StateMachine CONDITION QT_FEATURE_qeventtransition
+    SOURCES
+        gui/qbasickeyeventtransition.cpp gui/qbasickeyeventtransition_p.h
+        gui/qbasicmouseeventtransition.cpp gui/qbasicmouseeventtransition_p.h
+        gui/qkeyeventtransition.cpp gui/qkeyeventtransition.h
+        gui/qmouseeventtransition.cpp gui/qmouseeventtransition.h
+        qeventtransition.cpp qeventtransition.h qeventtransition_p.h
+    LIBRARIES
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    PRIVATE_MODULE_INTERFACE
+        Qt::GuiPrivate
+)
diff --git a/src/statemachine/configure.cmake b/src/statemachine/configure.cmake
new file mode 100644
index 0000000..f759b4b
--- /dev/null
+++ b/src/statemachine/configure.cmake
@@ -0,0 +1,26 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("statemachine" PUBLIC
+    SECTION "Utilities"
+    LABEL "State machine"
+    PURPOSE "Provides hierarchical finite state machines."
+)
+qt_feature_definition("statemachine" "QT_NO_STATEMACHINE" NEGATE VALUE "1")
+qt_feature("qeventtransition" PUBLIC
+    LABEL "QEventTransition class"
+    CONDITION QT_FEATURE_statemachine
+)
diff --git a/src/statemachine/qt_cmdline.cmake b/src/statemachine/qt_cmdline.cmake
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/statemachine/qt_cmdline.cmake