Commit dc102185 authored by Laurent Montel's avatar Laurent Montel
Browse files

Make it compile against qt6

parent 2ccc6eff
Pipeline #149157 passed with stage
in 1 minute and 35 seconds
......@@ -98,8 +98,14 @@ else()
endif()
endif()
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(
-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00
-DQT_DEPRECATED_WARNINGS_SINCE=0x060000
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800
-DKF_DEPRECATED_WARNINGS_SINCE=0x060000
)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
......
......@@ -7,9 +7,9 @@
#include "pindialog.h"
#include <QDesktopWidget>
#include <QIcon>
#include <QIntValidator>
#include <QScreen>
#include <KLocalizedString>
#include <KWindowSystem>
......@@ -48,7 +48,8 @@ PinDialog::PinDialog(ModemManager::Modem *modem, const Type type, QWidget *paren
ui->puk->setValidator(validator2);
ui->errorMessage->setHidden(true);
QRect desktop = QApplication::desktop()->screenGeometry(topLevelWidget());
const QRect desktop = screen()->availableGeometry();
// QRect desktop = QApplication::desktop()->screenGeometry(topLevelWidget());
setMinimumWidth(360); // width of the PinePhone display
pixmapLabel = new QLabel(this);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment