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:
Mortie 2022-08-29 12:21:09 +04:30
parent 050d987d3b
commit 8c20a67cfa
140 changed files with 5924 additions and 214 deletions

View file

@ -1,7 +1,7 @@
#include "NetworkSettingsLogic.h"
#include "defines.h"
#include "utils.h"
#include "utilities.h"
NetworkSettingsLogic::NetworkSettingsLogic(UiLogic *logic, QObject *parent):
PageLogicBase(logic, parent),
@ -21,14 +21,14 @@ void NetworkSettingsLogic::onUpdatePage()
void NetworkSettingsLogic::onLineEditDns1EditFinished(const QString &text)
{
if (ipAddressRegex().exactMatch(text)) {
if (ipAddressRegex().match(text).hasMatch()) {
m_settings.setPrimaryDns(text);
}
}
void NetworkSettingsLogic::onLineEditDns2EditFinished(const QString &text)
{
if (ipAddressRegex().exactMatch(text)) {
if (ipAddressRegex().match(text).hasMatch()) {
m_settings.setSecondaryDns(text);
}
}