0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00

Finish 1.4.114

# Conflicts:
#	limereport/lrbasedesignintf.cpp
This commit is contained in:
Arin Alexander 2019-01-08 20:07:01 +03:00
commit c00b8aa50c

View File

@ -1180,13 +1180,6 @@ void BaseDesignIntf::showEditorDialog(){
QWidget *editor = defaultEditor();
if (editor) {
editor->setStyleSheet(findRootWidget(scene()->views().at(0))->styleSheet());
#ifdef Q_OS_WIN
editor->setAttribute(Qt::WA_DeleteOnClose);
editor->setWindowFlags(Qt::Dialog);
editor->setWindowModality(Qt::ApplicationModal);
editor->show();
#else
QDialog* dialog = new QDialog(QApplication::activeWindow());
dialog->setAttribute(Qt::WA_DeleteOnClose);
#ifdef Q_OS_MAC
@ -1201,7 +1194,6 @@ void BaseDesignIntf::showEditorDialog(){
connect(editor,SIGNAL(destroyed()),dialog,SLOT(close()));
dialog->setWindowTitle(editor->windowTitle());
dialog->exec();
#endif
}
}