From 85d4181dd9786eab1837bd50880183b38934e0ee Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 14 Nov 2019 17:26:29 +0100 Subject: Regenerate projects Change-Id: I464e8b9d4fa2b3ed69d1b0de9bdd7f9f31150259 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/gamepad/CMakeLists.txt | 5 ++--- src/imports/gamepad/CMakeLists.txt | 3 +-- src/plugins/gamepads/android/jar/CMakeLists.txt | 28 +++++++------------------ src/plugins/gamepads/android/src/CMakeLists.txt | 3 +-- src/plugins/gamepads/darwin/CMakeLists.txt | 3 +-- src/plugins/gamepads/evdev/CMakeLists.txt | 3 +-- src/plugins/gamepads/sdl2/CMakeLists.txt | 3 +-- src/plugins/gamepads/xinput/CMakeLists.txt | 3 +-- 8 files changed, 16 insertions(+), 35 deletions(-) diff --git a/src/gamepad/CMakeLists.txt b/src/gamepad/CMakeLists.txt index c460b01..01f520c 100644 --- a/src/gamepad/CMakeLists.txt +++ b/src/gamepad/CMakeLists.txt @@ -4,7 +4,7 @@ ## Gamepad Module: ##################################################################### -add_qt_module(Gamepad +qt_add_module(Gamepad PLUGIN_TYPES gamepads SOURCES qgamepad.cpp qgamepad.h @@ -34,8 +34,7 @@ endif() #### Keys ignored in scope 1:.:.:gamepad.pro:: # ANDROID_FEATURES = "android.hardware.gamepad" -# _LOADED = "qt_module" -add_qt_docs(Gamepad +qt_add_docs(Gamepad doc/qtgamepad.qdocconf ) diff --git a/src/imports/gamepad/CMakeLists.txt b/src/imports/gamepad/CMakeLists.txt index ed400e6..358c119 100644 --- a/src/imports/gamepad/CMakeLists.txt +++ b/src/imports/gamepad/CMakeLists.txt @@ -4,7 +4,7 @@ ## declarative_gamepad Plugin: ##################################################################### -add_qml_module(declarative_gamepad +qt_add_qml_module(declarative_gamepad URI "QtGamepad" VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QGamepadModule @@ -25,4 +25,3 @@ add_qml_module(declarative_gamepad # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" # TARGETPATH = "QtGamepad" -# _LOADED = "qml_plugin" diff --git a/src/plugins/gamepads/android/jar/CMakeLists.txt b/src/plugins/gamepads/android/jar/CMakeLists.txt index 6f5a166..17a5a64 100644 --- a/src/plugins/gamepads/android/jar/CMakeLists.txt +++ b/src/plugins/gamepads/android/jar/CMakeLists.txt @@ -1,30 +1,18 @@ # Generated from jar.pro. -##################################################################### -## QtAndroidGamepad Binary: -##################################################################### - -# special case begin - -set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/) +qt_get_android_sdk_jar_for_api("android-16" android_sdk) set(java_sources - ${path_prefix}/gamepad/QtGamepad.java) + src/org/qtproject/qt5/android/gamepad/QtGamepad.java +) add_jar(QtAndroidGamepad - INCLUDE_JARS ${QT_ANDROID_JAR} + INCLUDE_JARS ${android_sdk} SOURCES ${java_sources} - ) +) -install_jar(QtAndroid +install_jar(QtAndroidGamepad DESTINATION jar - COMPONENT Devel) - -# special case end + COMPONENT Devel +) -#### Keys ignored in scope 1:.:.:jar.pro:: -# API_VERSION = "android-16" -# JAVACLASSPATH = "$$PWD/src" -# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/gamepad/QtGamepad.java" -# OTHER_FILES = "$$JAVASOURCES" -# _LOADED = "qt_build_paths" diff --git a/src/plugins/gamepads/android/src/CMakeLists.txt b/src/plugins/gamepads/android/src/CMakeLists.txt index 1973852..141b3b6 100644 --- a/src/plugins/gamepads/android/src/CMakeLists.txt +++ b/src/plugins/gamepads/android/src/CMakeLists.txt @@ -4,7 +4,7 @@ ## androidgamepad Plugin: ##################################################################### -add_qt_plugin(androidgamepad +qt_add_plugin(androidgamepad TYPE gamepads CLASS_NAME QAndroidGamepadBackendPlugin SOURCES @@ -21,4 +21,3 @@ add_qt_plugin(androidgamepad #### Keys ignored in scope 1:.:.:src.pro:: # DISTFILES = "android.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/gamepads/darwin/CMakeLists.txt b/src/plugins/gamepads/darwin/CMakeLists.txt index fc5e6db..b608b0e 100644 --- a/src/plugins/gamepads/darwin/CMakeLists.txt +++ b/src/plugins/gamepads/darwin/CMakeLists.txt @@ -4,7 +4,7 @@ ## darwingamepad Plugin: ##################################################################### -add_qt_plugin(darwingamepad +qt_add_plugin(darwingamepad TYPE gamepads CLASS_NAME QDarwinGamepadBackendPlugin SOURCES @@ -23,4 +23,3 @@ add_qt_plugin(darwingamepad #### Keys ignored in scope 1:.:.:darwin.pro:: # OTHER_FILES = "darwin.json" # PLUGIN_EXTENDS = "gamepad" -# _LOADED = "qt_plugin" diff --git a/src/plugins/gamepads/evdev/CMakeLists.txt b/src/plugins/gamepads/evdev/CMakeLists.txt index bd7f3d8..36eae36 100644 --- a/src/plugins/gamepads/evdev/CMakeLists.txt +++ b/src/plugins/gamepads/evdev/CMakeLists.txt @@ -4,7 +4,7 @@ ## evdevgamepad Plugin: ##################################################################### -add_qt_plugin(evdevgamepad +qt_add_plugin(evdevgamepad TYPE gamepads CLASS_NAME QEvdevGamepadBackendPlugin SOURCES @@ -23,4 +23,3 @@ add_qt_plugin(evdevgamepad #### Keys ignored in scope 1:.:.:evdev.pro:: # OTHER_FILES = "evdev.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/gamepads/sdl2/CMakeLists.txt b/src/plugins/gamepads/sdl2/CMakeLists.txt index 0fabe8d..28f7937 100644 --- a/src/plugins/gamepads/sdl2/CMakeLists.txt +++ b/src/plugins/gamepads/sdl2/CMakeLists.txt @@ -4,7 +4,7 @@ ## sdl2gamepad Plugin: ##################################################################### -add_qt_plugin(sdl2gamepad +qt_add_plugin(sdl2gamepad TYPE gamepads CLASS_NAME QSdl2GamepadBackendPlugin SOURCES @@ -21,4 +21,3 @@ add_qt_plugin(sdl2gamepad #### Keys ignored in scope 1:.:.:sdl2.pro:: # OTHER_FILES = "sdl2.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/gamepads/xinput/CMakeLists.txt b/src/plugins/gamepads/xinput/CMakeLists.txt index 4422b80..de12c01 100644 --- a/src/plugins/gamepads/xinput/CMakeLists.txt +++ b/src/plugins/gamepads/xinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## xinputgamepad Plugin: ##################################################################### -add_qt_plugin(xinputgamepad +qt_add_plugin(xinputgamepad TYPE gamepads CLASS_NAME QXInputGamepadBackendPlugin SOURCES @@ -20,4 +20,3 @@ add_qt_plugin(xinputgamepad #### Keys ignored in scope 1:.:.:xinput.pro:: # OTHER_FILES = "xinput.json" -# _LOADED = "qt_plugin" -- cgit v1.2.3