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
|
|
@ -104,7 +104,7 @@ void CFramelessWindow::addIgnoreWidget(QWidget* widget)
|
|||
bool CFramelessWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
|
||||
{
|
||||
if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7) {
|
||||
return QMainWindow::nativeEvent(eventType, message, result);
|
||||
return QMainWindow::nativeEvent(eventType, message, reinterpret_cast<qintptr*>(result));
|
||||
}
|
||||
|
||||
//Workaround for known bug -> check Qt forum : https://forum.qt.io/topic/93141/qtablewidget-itemselectionchanged/13
|
||||
|
|
@ -252,7 +252,7 @@ bool CFramelessWindow::nativeEvent(const QByteArray &eventType, void *message, l
|
|||
return false;
|
||||
}
|
||||
default:
|
||||
return QMainWindow::nativeEvent(eventType, message, result);
|
||||
return QMainWindow::nativeEvent(eventType, message, reinterpret_cast<qintptr*>(result));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ QMargins CFramelessWindow::contentsMargins() const
|
|||
}
|
||||
void CFramelessWindow::getContentsMargins(int *left, int *top, int *right, int *bottom) const
|
||||
{
|
||||
QMainWindow::getContentsMargins(left,top,right,bottom);
|
||||
getContentsMargins(left,top,right,bottom);
|
||||
if (!(left&&top&&right&&bottom)) return;
|
||||
if (isMaximized())
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue