diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 9661ec815..2f290f930 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -289,6 +289,7 @@ App::App(int &argc, char *argv[]) // The EXECUTABLE_NAME will be used in qt standard paths. It's our goal. QThread::currentThread()->setPriority(QThread::HighPriority); qDebug() << "app thread is" << QThread::currentThread(); + lDebug() << "Starting app with Qt version" << qVersion(); QCoreApplication::setApplicationName(EXECUTABLE_NAME); QApplication::setOrganizationDomain(EXECUTABLE_NAME); QCoreApplication::setApplicationVersion(APPLICATION_SEMVER); @@ -1480,6 +1481,10 @@ QString App::getSdkVersion() { #endif } +QString App::getQtVersion() const { + return qVersion(); +} + void App::checkForUpdate(bool requestedByUser) { mustBeInMainThread(log().arg(Q_FUNC_INFO)); if (CoreModel::getInstance() && mCoreModelConnection) { diff --git a/Linphone/core/App.hpp b/Linphone/core/App.hpp index ef0719258..fbf5d3725 100644 --- a/Linphone/core/App.hpp +++ b/Linphone/core/App.hpp @@ -46,6 +46,7 @@ class App : public SingleApplication, public AbstractObject { Q_PROPERTY(AccountList *accounts READ getAccounts NOTIFY accountsChanged) Q_PROPERTY(CallList *calls READ getCalls NOTIFY callsChanged) Q_PROPERTY(QString shortApplicationVersion READ getShortApplicationVersion CONSTANT) + Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT) Q_PROPERTY(QString gitBranchName READ getGitBranchName CONSTANT) Q_PROPERTY(QString sdkVersion READ getSdkVersion CONSTANT) Q_PROPERTY(ChatGui *currentChat READ getCurrentChat WRITE setCurrentChat NOTIFY currentChatChanged) @@ -164,6 +165,7 @@ public: QString getShortApplicationVersion(); QString getGitBranchName(); QString getSdkVersion(); + QString getQtVersion() const; Q_INVOKABLE void checkForUpdate(bool requestedByUser = false); ChatGui *getCurrentChat() const; diff --git a/Linphone/data/image/qt-logo.png b/Linphone/data/image/qt-logo.png new file mode 100644 index 000000000..0c2da4bf6 Binary files /dev/null and b/Linphone/data/image/qt-logo.png differ diff --git a/Linphone/tool/Constants.hpp b/Linphone/tool/Constants.hpp index dccbd0f5f..0f81ba837 100644 --- a/Linphone/tool/Constants.hpp +++ b/Linphone/tool/Constants.hpp @@ -129,7 +129,7 @@ public: static constexpr char LinphoneDomain[] = "sip.linphone.org"; // Use for checking if config are a Linphone static constexpr char WindowIconPath[] = ":/data/image/logo.svg"; - static constexpr char ApplicationMinimalQtVersion[] = "6.6.5"; + static constexpr char ApplicationMinimalQtVersion[] = "6.9.0"; static constexpr char DefaultConferenceURI[] = "sip:conference-factory@sip.linphone.org"; // Default for a Linphone account static constexpr char DefaultVideoConferenceURI[] = diff --git a/Linphone/view/Control/Button/HelpIconLabelButton.qml b/Linphone/view/Control/Button/HelpIconLabelButton.qml index 801dc77d7..c51c8bd58 100644 --- a/Linphone/view/Control/Button/HelpIconLabelButton.qml +++ b/Linphone/view/Control/Button/HelpIconLabelButton.qml @@ -11,6 +11,7 @@ MouseArea { property string subTitle property real iconSize: Utils.getSizeWithScreenRatio(32) property bool shadowEnabled: containsMouse || activeFocus + property alias image: image hoverEnabled: true width: content.implicitWidth height: content.implicitHeight @@ -27,6 +28,7 @@ MouseArea { anchors.verticalCenter: parent.verticalCenter anchors.fill:parent EffectImage { + id: image Layout.preferredWidth: mainItem.iconSize Layout.preferredHeight: mainItem.iconSize width: mainItem.iconSize diff --git a/Linphone/view/Page/Main/Help/HelpPage.qml b/Linphone/view/Page/Main/Help/HelpPage.qml index 736df377e..4b4566a00 100644 --- a/Linphone/view/Page/Main/Help/HelpPage.qml +++ b/Linphone/view/Page/Main/Help/HelpPage.qml @@ -111,6 +111,16 @@ AbstractMainPage { onClicked: AppCpp.checkForUpdate(true) } } + HelpIconLabelButton { + id: qtVersionButton + Layout.preferredWidth: width + Layout.minimumWidth: width + iconSource: AppIcons.qtLogo + //: "Qt Version" + title: qsTr("help_about_qt_version_title") + subTitle: AppCpp.qtVersion + onClicked: {} + } HelpIconLabelButton { Layout.fillWidth: true iconSource: AppIcons.license diff --git a/Linphone/view/Style/AppIcons.qml b/Linphone/view/Style/AppIcons.qml index 42d66e6fe..0697a8d36 100644 --- a/Linphone/view/Style/AppIcons.qml +++ b/Linphone/view/Style/AppIcons.qml @@ -159,4 +159,5 @@ QtObject { property string photo: "image://internal/photo.svg" property string ephemeralSettings: "image://internal/ephemeral-settings.svg" property string hourglass: "image://internal/hourglass-simple.svg" + property string qtLogo: "image://internal/qt-logo.png" }