diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | coin/module_config.yaml | 1 | ||||
| -rw-r--r-- | config.tests/winrt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 | ||||
| -rw-r--r-- | examples/sensors/maze/Info.plist | 32 | ||||
| -rw-r--r-- | src/plugins/sensors/winrt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/sensors/doc/qtsensors.qdocconf | 11 | ||||
| -rw-r--r-- | tests/auto/common/test_backends.cpp | 3 |
9 files changed, 49 insertions, 14 deletions
diff --git a/.cmake.conf b/.cmake.conf index ac3b6f4a..e62fae5e 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.4") +set(QT_REPO_MODULE_VERSION "6.2.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index b2967e2d..44014500 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 6.2.4 +MODULE_VERSION = 6.2.8 diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 16d158c6..32d73fc0 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,5 @@ version: 2 +alias: qtsensors accept_configuration: condition: property property: features diff --git a/config.tests/winrt/CMakeLists.txt b/config.tests/winrt/CMakeLists.txt index d6db7de9..0e62234b 100644 --- a/config.tests/winrt/CMakeLists.txt +++ b/config.tests/winrt/CMakeLists.txt @@ -22,6 +22,6 @@ add_executable(${PROJECT_NAME} if(MSVC) target_link_libraries(${PROJECT_NAME} PRIVATE - runtimeobject.lib + runtimeobject ) endif() diff --git a/dependencies.yaml b/dependencies.yaml index fcd8f8e7..8a79b5d7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: - ../qtbase: - ref: 7a5b98e0fefcbf061cb9e3d9edecc75fff364519 + ../tqtc-qtbase: + ref: 4c1c38dede55565afa846685b3e19cf8f1cfed0c required: true - ../qtdeclarative: - ref: 39bc38d85abef1d7a471a335cdec1773b19aa6e8 + ../tqtc-qtdeclarative: + ref: 9919f58fce6329a233ca885188d0aba5f484e546 required: false diff --git a/examples/sensors/maze/Info.plist b/examples/sensors/maze/Info.plist new file mode 100644 index 00000000..2458247c --- /dev/null +++ b/examples/sensors/maze/Info.plist @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDisplayName</key> + <string>maze</string> + <key>CFBundleExecutable</key> + <string>maze</string> + <key>CFBundleGetInfoString</key> + <string>Created by Qt/QMake</string> + <key>CFBundleIdentifier</key> + <string>com.qt.sensorsmaze</string> + <key>CFBundleName</key> + <string>maze</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>LSRequiresIPhoneOS</key> + <true/> + <key>UILaunchStoryboardName</key> + <string>LaunchScreen</string> + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + </array> +</dict> +</plist> diff --git a/src/plugins/sensors/winrt/CMakeLists.txt b/src/plugins/sensors/winrt/CMakeLists.txt index 455c1f01..16a64294 100644 --- a/src/plugins/sensors/winrt/CMakeLists.txt +++ b/src/plugins/sensors/winrt/CMakeLists.txt @@ -22,7 +22,7 @@ qt_internal_add_plugin(WinRtSensorPlugin qt_internal_extend_target(WinRtSensorPlugin CONDITION MSVC LIBRARIES - runtimeobject.lib + runtimeobject ) #### Keys ignored in scope 1:.:.:winrt.pro:<TRUE>: diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf index 0e83785c..33d50884 100644 --- a/src/sensors/doc/qtsensors.qdocconf +++ b/src/sensors/doc/qtsensors.qdocconf @@ -1,4 +1,3 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) include($QT_INSTALL_DOCS/config/exampleurl-qtsensors.qdocconf) @@ -20,18 +19,18 @@ qhp.QtSensors.customFilters.Qt.filterAttributes = qtsensors $QT_VERSION qhp.QtSensors.subprojects = overviews classes qmltypes examples qhp.QtSensors.subprojects.overviews.title = Overview qhp.QtSensors.subprojects.overviews.indexTitle = Qt Sensors -qhp.QtSensors.subprojects.overviews.selectors = fake:page,group,module +qhp.QtSensors.subprojects.overviews.selectors = doc:page,group,module qhp.QtSensors.subprojects.classes.title = C++ Classes qhp.QtSensors.subprojects.classes.indexTitle = Qt Sensors C++ Classes -qhp.QtSensors.subprojects.classes.selectors = class fake:headerfile +qhp.QtSensors.subprojects.classes.selectors = class headerfile qhp.QtSensors.subprojects.classes.sortPages = true qhp.QtSensors.subprojects.qmltypes.title = QML Types qhp.QtSensors.subprojects.qmltypes.indexTitle = Qt Sensors QML Types -qhp.QtSensors.subprojects.qmltypes.selectors = qmlclass +qhp.QtSensors.subprojects.qmltypes.selectors = qmltype qhp.QtSensors.subprojects.qmltypes.sortPages = true qhp.QtSensors.subprojects.examples.title = Examples qhp.QtSensors.subprojects.examples.indexTitle = Qt Sensors Examples -qhp.QtSensors.subprojects.examples.selectors = fake:example +qhp.QtSensors.subprojects.examples.selectors = doc:example tagfile = ../../../doc/qtsensors/qtsensors.tags @@ -58,7 +57,7 @@ excludefiles += ../../sensorsquick/qmlsensorgesture.cpp \ src/qtsensorgestures-cpp.qdoc \ src/qtsensorgestures-plugins.qdoc -depends += qtcore qtdoc qtgui qtquick +depends += qtcore qtdoc qtgui qtquick qtcmake navigation.landingpage = "Qt Sensors" navigation.cppclassespage = "Qt Sensors C++ Classes" diff --git a/tests/auto/common/test_backends.cpp b/tests/auto/common/test_backends.cpp index cbdda60c..02909521 100644 --- a/tests/auto/common/test_backends.cpp +++ b/tests/auto/common/test_backends.cpp @@ -27,8 +27,11 @@ ****************************************************************************/ #include <QtCore/QList> +#include <QtCore/QMap> +#include <QtCore/QVariantMap> #include "qsensorbackend.h" + typedef QSensorBackend* (*CreateFunc) (QSensor *sensor); class Record { |