Resolve merge conflict.
This commit is contained in:
commit
f7212d4f90
2 files changed
+3
-4
No files matched your search
@@ -34,9 +34,6 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) :
|
||||
|
||||
setStandardResolutionSizes();
|
||||
|
||||
if( objectName().isEmpty() )
|
||||
setObjectName( QStringLiteral( "ConfigureResolution" ) );
|
||||
|
||||
// Config dialog
|
||||
|
||||
setObjectName( QStringLiteral( "ConfigureResolution" ) );
|
||||
@@ -162,6 +159,8 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) :
|
||||
connect( dialogButtonOkCancel, SIGNAL( accepted() ), this, SLOT( accept() ) );
|
||||
connect( dialogButtonOkCancel, SIGNAL( rejected() ), this, SLOT( reject() ) );
|
||||
|
||||
QMetaObject::connectSlotsByName(this);
|
||||
|
||||
}
|
||||
|
||||
void ConfigureResolutionDialog::StandardResolutionSelection()
|
||||
|
||||
@@ -70,7 +70,7 @@ ImageInterface::~ImageInterface()
|
||||
|
||||
bool ImageInterface::loadFile( const QString &fileName )
|
||||
{
|
||||
ConfigureResolutionDialog resolutionDialog;
|
||||
ConfigureResolutionDialog resolutionDialog(this);
|
||||
|
||||
if( resolutionDialog.exec() == QDialog::Rejected )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user