Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix build Qt 6.2 MSVC2019 Windows #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2022
Merged

Fix build Qt 6.2 MSVC2019 Windows #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 2 src/plugins/servicebackends/standard/standardservicecontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ QString StandardServiceControl::serviceName() const
if (info.isExecutable())
return QFileInfo{serviceId()}.completeBaseName();
else
return serviceId().split(QLatin1Char('/'), QString::SkipEmptyParts).last();
return serviceId().split(QLatin1Char('/'), Qt::SkipEmptyParts).last();
}

QSharedPointer<QLockFile> StandardServiceControl::statusLock() const
Expand Down
13 changes: 9 additions & 4 deletions 13 src/plugins/servicebackends/windows/windowsservicebackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int WindowsServiceBackend::runService(int &argc, char **argv, int flags)
if(_status.dwWin32ExitCode != NO_ERROR)
return EXIT_FAILURE;
// generate "local" arguments
auto sArgc = _svcArgs.size();
int sArgc = _svcArgs.size();
QVector<char*> sArgv;
sArgv.reserve(sArgc);
for(auto &arg : _svcArgs)
Expand All @@ -98,7 +98,7 @@ int WindowsServiceBackend::runService(int &argc, char **argv, int flags)
// create and prepare the coreapp
qCDebug(logBackend) << "setting status to start pending";
setStatus(SERVICE_START_PENDING);
QCoreApplication app(sArgc, sArgv.data(), flags);
QCoreApplication app(sArgc, sArgv.data(), flags);
app.installNativeEventFilter(new SvcEventFilter{});
setStatus(SERVICE_START_PENDING);
if(!preStartService())
Expand Down Expand Up @@ -368,8 +368,13 @@ void WindowsServiceBackend::SvcControlThread::run()
}



bool WindowsServiceBackend::SvcEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool WindowsServiceBackend::SvcEventFilter::nativeEventFilter(
const QByteArray &eventType, void *message, long *result)
#else
bool WindowsServiceBackend::SvcEventFilter::nativeEventFilter(
const QByteArray &eventType, void *message, long long *result)
#endif
{
if(eventType == "windows_generic_MSG" ||
eventType == "windows_dispatcher_MSG") {
Expand Down
6 changes: 5 additions & 1 deletion 6 src/plugins/servicebackends/windows/windowsservicebackend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ private Q_SLOTS:
class SvcEventFilter : public QAbstractNativeEventFilter
{
public:
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
#else
bool nativeEventFilter(const QByteArray &eventType, void *message, long long *result);
#endif
};

static QPointer<WindowsServiceBackend> _backendInstance;
Expand Down
4 changes: 2 additions & 2 deletions 4 src/service/service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,11 @@ protected Q_SLOTS:

//! Overload for qHash
Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::Service::CommandResult key, uint seed = 0) Q_DECL_NOTHROW {
return ::qHash(static_cast<int>(key), seed);
return static_cast<uint>(::qHash(static_cast<int>(key), seed));
}
//! Overload for qHash
Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::Service::TerminalMode key, uint seed = 0) Q_DECL_NOTHROW {
return ::qHash(static_cast<int>(key), seed);
return static_cast<uint>(::qHash(static_cast<int>(key), seed));
}

template<typename TFunction>
Expand Down
2 changes: 1 addition & 1 deletion 2 src/service/servicebackend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private Q_SLOTS:

//! Overload for qHash
Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceBackend::ServiceCommand key, uint seed = 0) Q_DECL_NOTHROW {
return ::qHash(static_cast<int>(key), seed);
return static_cast<uint>(::qHash(static_cast<int>(key), seed));
}

template<typename TRet, typename... TArgs>
Expand Down
6 changes: 3 additions & 3 deletions 6 src/service/servicecontrol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ public Q_SLOTS:

//! Overload for qHash
Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceControl::SupportFlags key, uint seed = 0) Q_DECL_NOTHROW {
return ::qHash(static_cast<int>(key), seed);
return static_cast<uint>(::qHash(static_cast<int>(key), seed));
}
//! Overload for qHash
Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceControl::Status key, uint seed = 0) Q_DECL_NOTHROW {
return ::qHash(static_cast<int>(key), seed);
return static_cast<uint>(::qHash(static_cast<int>(key), seed));
}
//! Overload for qHash
Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceControl::BlockMode key, uint seed = 0) Q_DECL_NOTHROW {
return ::qHash(static_cast<int>(key), seed);
return static_cast<uint>(::qHash(static_cast<int>(key), seed));
}

// ------------- Generic Implementations -------------
Expand Down
6 changes: 3 additions & 3 deletions 6 src/service/terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Terminal::Terminal(TerminalPrivate *d_ptr, QObject *parent) :

connect(d->socket, &QLocalSocket::disconnected,
this, &Terminal::terminalDisconnected);
connect(d->socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
connect(d->socket, &QLocalSocket::errorOccurred,
this, [this](QLocalSocket::LocalSocketError e) {
if(e != QLocalSocket::PeerClosedError) {
setErrorString(d->socket->errorString());
Expand Down Expand Up @@ -283,7 +283,7 @@ TerminalPrivate::TerminalPrivate(QLocalSocket *socket, QObject *parent) :

connect(socket, &QLocalSocket::disconnected,
this, &TerminalPrivate::disconnected);
connect(socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
connect(socket, &QLocalSocket::errorOccurred,
this, &TerminalPrivate::error);
connect(socket, &QLocalSocket::readyRead,
this, &TerminalPrivate::readyRead);
Expand Down Expand Up @@ -328,7 +328,7 @@ void TerminalPrivate::readyRead()
terminalMode = static_cast<Service::TerminalMode>(tMode);
isLoading = false;
//disconnect all but "disconencted" - that one is needed for auto-delete
disconnect(socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
disconnect(socket, &QLocalSocket::errorOccurred,
this, &TerminalPrivate::error);
disconnect(socket, &QLocalSocket::readyRead,
this, &TerminalPrivate::readyRead);
Expand Down
2 changes: 1 addition & 1 deletion 2 src/service/terminalclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void TerminalClient::setupChannels()
this, &TerminalClient::connected);
connect(_socket, &QLocalSocket::disconnected,
this, &TerminalClient::disconnected);
connect(_socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
connect(_socket, &QLocalSocket::errorOccurred,
this, &TerminalClient::error);
connect(_socket, &QLocalSocket::readyRead,
this, &TerminalClient::socketReady,
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.