migrated the codebase to Qt6 and fixed some compatibility issues
* used a Qt6 ported version of SortFilterProxyModel * used an updated Qt6 compatible version of QXZing * added a flag to windows linker to avoid WinMain problem of MSVCRTD * renamed utils.cpp to utilities.cpp for avoiding confusion with the same file name in SortFilterProxyModel
This commit is contained in:
parent
050d987d3b
commit
8c20a67cfa
140 changed files with 5924 additions and 214 deletions
|
@ -663,7 +663,7 @@ QtServiceBase::QtServiceBase(int argc, char **argv, const QString &name)
|
|||
d_ptr = new QtServiceBasePrivate(nm);
|
||||
d_ptr->q_ptr = this;
|
||||
|
||||
d_ptr->serviceFlags = 0;
|
||||
d_ptr->serviceFlags = QtServiceBase::Default;
|
||||
d_ptr->sysd = 0;
|
||||
for (int i = 0; i < argc; ++i)
|
||||
d_ptr->args.append(QString::fromLocal8Bit(argv[i]));
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
# define QT_QTSERVICE_EXPORT
|
||||
#endif
|
||||
|
||||
class QStringList;
|
||||
//class QStringList;
|
||||
class QtServiceControllerPrivate;
|
||||
|
||||
class QT_QTSERVICE_EXPORT QtServiceController
|
||||
|
|
|
@ -737,10 +737,10 @@ class QtServiceAppEventFilter : public QAbstractNativeEventFilter
|
|||
{
|
||||
public:
|
||||
QtServiceAppEventFilter() {}
|
||||
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
|
||||
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result);
|
||||
};
|
||||
|
||||
bool QtServiceAppEventFilter::nativeEventFilter(const QByteArray &, void *message, long *result)
|
||||
bool QtServiceAppEventFilter::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
|
||||
{
|
||||
MSG *winMessage = (MSG*)message;
|
||||
if (winMessage->message == WM_ENDSESSION && (winMessage->lParam & ENDSESSION_LOGOFF)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue