display qt version in help page
This commit is contained in:
parent
d741e79e2e
commit
3dbea1ccb2
7 changed files with 21 additions and 1 deletions
|
|
@ -289,6 +289,7 @@ App::App(int &argc, char *argv[])
|
||||||
// The EXECUTABLE_NAME will be used in qt standard paths. It's our goal.
|
// The EXECUTABLE_NAME will be used in qt standard paths. It's our goal.
|
||||||
QThread::currentThread()->setPriority(QThread::HighPriority);
|
QThread::currentThread()->setPriority(QThread::HighPriority);
|
||||||
qDebug() << "app thread is" << QThread::currentThread();
|
qDebug() << "app thread is" << QThread::currentThread();
|
||||||
|
lDebug() << "Starting app with Qt version" << qVersion();
|
||||||
QCoreApplication::setApplicationName(EXECUTABLE_NAME);
|
QCoreApplication::setApplicationName(EXECUTABLE_NAME);
|
||||||
QApplication::setOrganizationDomain(EXECUTABLE_NAME);
|
QApplication::setOrganizationDomain(EXECUTABLE_NAME);
|
||||||
QCoreApplication::setApplicationVersion(APPLICATION_SEMVER);
|
QCoreApplication::setApplicationVersion(APPLICATION_SEMVER);
|
||||||
|
|
@ -1480,6 +1481,10 @@ QString App::getSdkVersion() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString App::getQtVersion() const {
|
||||||
|
return qVersion();
|
||||||
|
}
|
||||||
|
|
||||||
void App::checkForUpdate(bool requestedByUser) {
|
void App::checkForUpdate(bool requestedByUser) {
|
||||||
mustBeInMainThread(log().arg(Q_FUNC_INFO));
|
mustBeInMainThread(log().arg(Q_FUNC_INFO));
|
||||||
if (CoreModel::getInstance() && mCoreModelConnection) {
|
if (CoreModel::getInstance() && mCoreModelConnection) {
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ class App : public SingleApplication, public AbstractObject {
|
||||||
Q_PROPERTY(AccountList *accounts READ getAccounts NOTIFY accountsChanged)
|
Q_PROPERTY(AccountList *accounts READ getAccounts NOTIFY accountsChanged)
|
||||||
Q_PROPERTY(CallList *calls READ getCalls NOTIFY callsChanged)
|
Q_PROPERTY(CallList *calls READ getCalls NOTIFY callsChanged)
|
||||||
Q_PROPERTY(QString shortApplicationVersion READ getShortApplicationVersion CONSTANT)
|
Q_PROPERTY(QString shortApplicationVersion READ getShortApplicationVersion CONSTANT)
|
||||||
|
Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT)
|
||||||
Q_PROPERTY(QString gitBranchName READ getGitBranchName CONSTANT)
|
Q_PROPERTY(QString gitBranchName READ getGitBranchName CONSTANT)
|
||||||
Q_PROPERTY(QString sdkVersion READ getSdkVersion CONSTANT)
|
Q_PROPERTY(QString sdkVersion READ getSdkVersion CONSTANT)
|
||||||
Q_PROPERTY(ChatGui *currentChat READ getCurrentChat WRITE setCurrentChat NOTIFY currentChatChanged)
|
Q_PROPERTY(ChatGui *currentChat READ getCurrentChat WRITE setCurrentChat NOTIFY currentChatChanged)
|
||||||
|
|
@ -164,6 +165,7 @@ public:
|
||||||
QString getShortApplicationVersion();
|
QString getShortApplicationVersion();
|
||||||
QString getGitBranchName();
|
QString getGitBranchName();
|
||||||
QString getSdkVersion();
|
QString getSdkVersion();
|
||||||
|
QString getQtVersion() const;
|
||||||
|
|
||||||
Q_INVOKABLE void checkForUpdate(bool requestedByUser = false);
|
Q_INVOKABLE void checkForUpdate(bool requestedByUser = false);
|
||||||
ChatGui *getCurrentChat() const;
|
ChatGui *getCurrentChat() const;
|
||||||
|
|
|
||||||
BIN
Linphone/data/image/qt-logo.png
Normal file
BIN
Linphone/data/image/qt-logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
|
|
@ -129,7 +129,7 @@ public:
|
||||||
|
|
||||||
static constexpr char LinphoneDomain[] = "sip.linphone.org"; // Use for checking if config are a Linphone
|
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 WindowIconPath[] = ":/data/image/logo.svg";
|
||||||
static constexpr char ApplicationMinimalQtVersion[] = "6.6.5";
|
static constexpr char ApplicationMinimalQtVersion[] = "6.9.0";
|
||||||
static constexpr char DefaultConferenceURI[] =
|
static constexpr char DefaultConferenceURI[] =
|
||||||
"sip:conference-factory@sip.linphone.org"; // Default for a Linphone account
|
"sip:conference-factory@sip.linphone.org"; // Default for a Linphone account
|
||||||
static constexpr char DefaultVideoConferenceURI[] =
|
static constexpr char DefaultVideoConferenceURI[] =
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ MouseArea {
|
||||||
property string subTitle
|
property string subTitle
|
||||||
property real iconSize: Utils.getSizeWithScreenRatio(32)
|
property real iconSize: Utils.getSizeWithScreenRatio(32)
|
||||||
property bool shadowEnabled: containsMouse || activeFocus
|
property bool shadowEnabled: containsMouse || activeFocus
|
||||||
|
property alias image: image
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
width: content.implicitWidth
|
width: content.implicitWidth
|
||||||
height: content.implicitHeight
|
height: content.implicitHeight
|
||||||
|
|
@ -27,6 +28,7 @@ MouseArea {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.fill:parent
|
anchors.fill:parent
|
||||||
EffectImage {
|
EffectImage {
|
||||||
|
id: image
|
||||||
Layout.preferredWidth: mainItem.iconSize
|
Layout.preferredWidth: mainItem.iconSize
|
||||||
Layout.preferredHeight: mainItem.iconSize
|
Layout.preferredHeight: mainItem.iconSize
|
||||||
width: mainItem.iconSize
|
width: mainItem.iconSize
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,16 @@ AbstractMainPage {
|
||||||
onClicked: AppCpp.checkForUpdate(true)
|
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 {
|
HelpIconLabelButton {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
iconSource: AppIcons.license
|
iconSource: AppIcons.license
|
||||||
|
|
|
||||||
|
|
@ -159,4 +159,5 @@ QtObject {
|
||||||
property string photo: "image://internal/photo.svg"
|
property string photo: "image://internal/photo.svg"
|
||||||
property string ephemeralSettings: "image://internal/ephemeral-settings.svg"
|
property string ephemeralSettings: "image://internal/ephemeral-settings.svg"
|
||||||
property string hourglass: "image://internal/hourglass-simple.svg"
|
property string hourglass: "image://internal/hourglass-simple.svg"
|
||||||
|
property string qtLogo: "image://internal/qt-logo.png"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue