Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/gui/qml/AccountBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ Pane {

Accessible.name: qsTr("Navigation bar")

Component.onCompleted: {
if (OCUtils.compareQVersion(6, 8, 3) >= 0) {
ToolTip.toolTip.popupType = Popup.Native;
}
}

Connections {
target: widget

Expand Down
10 changes: 10 additions & 0 deletions src/gui/qmlutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,13 @@ bool OCC::QmlUtils::OCQuickWidget::event(QEvent *event)
}
return QQuickWidget::event(event);
}

QString OCC::QmlUtils::OCUtils::qVersion() const
{
return QString::fromUtf8(::qVersion());
}

int OCC::QmlUtils::OCUtils::compareQVersion(int major, int minor, int patch) const
{
return QVersionNumber::compare(QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH), QVersionNumber(major, minor, patch));
}
15 changes: 15 additions & 0 deletions src/gui/qmlutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,19 @@ class OCQuickWidget : public QQuickWidget
private:
QWidget *_parentFocusWidget;
};


class OCUtils : public QObject
{
Q_OBJECT
Q_PROPERTY(QString qVersion READ qVersion CONSTANT)
QML_SINGLETON
QML_ELEMENT
public:
using QObject::QObject;

QString qVersion() const;

Q_INVOKABLE int compareQVersion(int major, int minor, int patch) const;
};
}