Enable windows-qt6 ci

This commit is contained in:
Waqar Ahmed
2023-03-10 11:39:04 +05:00
parent b1b811f99a
commit 51c089cf27
3 changed files with 20 additions and 14 deletions

View File

@@ -5,6 +5,7 @@ include:
# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml

View File

@@ -917,22 +917,24 @@ inline bool Profile::canInheritProperty(Property p)
template<class T>
inline T Profile::property(Property p) const
{
return property<QVariant>(p).value<T>();
}
auto getVariant = [this, p]() {
auto it = _propertyValues.find(p);
if (it != _propertyValues.end()) {
return it->second;
} else if (_parent && canInheritProperty(p)) {
return _parent->property<QVariant>(p);
} else {
return QVariant();
}
};
template<>
inline QVariant Profile::property(Property p) const
{
auto it = _propertyValues.find(p);
if (it != _propertyValues.end()) {
return it->second;
} else if (_parent && canInheritProperty(p)) {
return _parent->property<QVariant>(p);
} else {
return QVariant();
if constexpr (std::is_same_v<T, QVariant>) {
return getVariant();
}
}
const QVariant variant = getVariant();
return variant.value<T>();
}
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

View File

@@ -6,8 +6,11 @@
#define IPTYPROCESS_H
#include <QDebug>
#include <QIODevice>
#include <QObject>
#include <QString>
#include <QStringList>
#include <QTimer>
#define CONPTY_MINIMAL_WINDOWS_VERSION 18309