0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-31 05:11:56 +03:00

Qt6 support added

This commit is contained in:
fralx
2021-01-20 14:47:05 +03:00
parent e3356a3d00
commit 81f27782be
39 changed files with 759 additions and 204 deletions

View File

@@ -34,7 +34,11 @@
#include <QFocusEvent>
#include <QApplication>
#include <QStyle>
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
#include <QScreen>
#else
#include <QDesktopWidget>
#endif
#include "lrtextitempropertyeditor.h"
namespace LimeReport{
@@ -66,7 +70,18 @@ void ButtonLineEditor::editButtonClicked()
{
TextItemPropertyEditor* editor = new TextItemPropertyEditor(QApplication::activeWindow());
editor->setAttribute(Qt::WA_DeleteOnClose);
editor->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, editor->size(), QApplication::desktop()->availableGeometry()));
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
editor->setGeometry(
QStyle::alignedRect(
Qt::LeftToRight,
Qt::AlignCenter,
editor->size(),
QGuiApplication::primaryScreen()->geometry()
)
);
#else
editor->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, editor->size(), QApplication::desktop()->geometry()));
#endif
editor->setWindowTitle(m_propertyName);
editor->setText(m_lineEdit->text());
connect(editor,SIGNAL(accepted()),this,SLOT(editingByEditorFinished()));