Commit 45e8fb58 authored by Volker Krause's avatar Volker Krause
Browse files

Compile with Qt 6

parent 892c044a
Pipeline #247822 passed with stage
in 4 minutes and 21 seconds
......@@ -32,7 +32,7 @@ void NoteEditorUtilsTest::testAddCheckmark()
QFETCH(QString, input);
QFETCH(int, position);
static const QChar unicode[] = {0x2713};
static const QChar unicode[] = {QChar(0x2713)};
const int size = sizeof(unicode) / sizeof(QChar);
const QString checkMark = QString::fromRawData(unicode, size);
......
......@@ -17,7 +17,7 @@ NoteEditorUtils::NoteEditorUtils() = default;
void NoteEditorUtils::addCheckmark(QTextCursor &cursor)
{
static const QChar unicode[] = {0x2713};
static const QChar unicode[] = {QChar(0x2713)};
const int size = sizeof(unicode) / sizeof(QChar);
const int position = cursor.position();
cursor.movePosition(QTextCursor::StartOfLine);
......
......@@ -43,12 +43,12 @@
#include <QApplication>
#include <QCheckBox>
#include <QDesktopWidget>
#include <QInputDialog>
#include <QLabel>
#include <QMenu>
#include <QMimeData>
#include <QPointer>
#include <QScreen>
#include <QSizeGrip>
#include <QTextEdit>
#include <QVBoxLayout>
......@@ -842,7 +842,7 @@ void KNote::prepare()
resize(mDisplayAttribute->size());
const QPoint &position = mDisplayAttribute->position();
QRect desk = qApp->desktop()->rect();
QRect desk = qApp->primaryScreen()->virtualGeometry();
desk.adjust(10, 10, -10, -10);
if (desk.intersects(QRect(position, mDisplayAttribute->size()))) {
move(position); // do before calling show() to avoid flicker
......
......@@ -9,6 +9,7 @@
#include "knotes_export.h"
#include <QFont>
#include <QObject>
#include <memory>
......
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