Skip to content
Snippets Groups Projects
Commit 9cc065b0 authored by Burak Hançerli's avatar Burak Hançerli :headphones:
Browse files

QDS-11195 Bump the QtQuickComponents SHA

parent e1dcc04c
No related branches found
No related tags found
1 merge request!16QDS-11195 Bump the QtQuickComponents SHA
Pipeline #64179 passed
......@@ -64,3 +64,13 @@ set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTA
set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_TARGET_SDK_VERSION 34)
qt6_import_qml_plugins(${PROJECT_NAME})
execute_process(COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND git -C ${CMAKE_SOURCE_DIR}/qtquickdesigner-components describe --always --tags OUTPUT_VARIABLE QT_QUICK_COMPONENTS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
add_definitions( -DGIT_VERSION="${GIT_VERSION}" )
add_definitions( -DQT_QUICK_COMPONENTS_VERSION="${QT_QUICK_COMPONENTS_VERSION}" )
message(STATUS "GIT_VERSION: ${GIT_VERSION}")
message(STATUS "QT_QUICK_COMPONENTS_VERSION: ${QT_QUICK_COMPONENTS_VERSION}")
message(STATUS "QT_VERSION: ${QT_VERSION}")
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.qt.qtdesignviewer"
android:installLocation="auto" android:versionCode="9" android:versionName="1.2">
android:installLocation="auto" android:versionCode="10" android:versionName="1.2">
<!-- %%INSERT_PERMISSIONS -->
<!-- %%INSERT_FEATURES -->
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
......
Subproject commit b3f1dcf0d1b46af04aafd59ceecdc9257fca0e71
Subproject commit 0e457477d54b068abc89cf124daedefe0436dd89
......@@ -70,9 +70,11 @@ Backend::Backend(QObject *parent) : QObject(parent)
#else
QString buildType = "Release";
#endif
m_buildInfo = QCoreApplication::applicationVersion() + "\nQt " + QString(QT_VERSION_STR) + " - "
+ buildType + " Build"
+ "\nOpenSSL support: " + QVariant(QSslSocket::supportsSsl()).toString();
m_buildInfo = QCoreApplication::applicationVersion() +
"\nTechnology Preview - " + QString(GIT_VERSION) +
"\nQt " + QString(QT_VERSION_STR) + " - " + buildType + " Build" +
"\nQt Quick Components " + QString(QT_QUICK_COMPONENTS_VERSION) +
"\nOpenSSL support: " + QVariant(QSslSocket::supportsSsl()).toString();
emit buildInfoChanged();
QSettings settings;
......
......@@ -18,18 +18,6 @@ Item {
Layout.fillWidth: true
}
Label {
id: label
text: qsTr("Android Design Viewer")
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
}
Label {
id: label1
text: qsTr("Technology Preview")
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
}
Label {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment