Skip to content

Commit 95f1db4

Browse files
author
jef
committed
set working directory for ui loader
git-svn-id: http://svn.osgeo.org/qgis/trunk@12220 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 075daae commit 95f1db4

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

src/app/qgsattributedialog.cpp

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include <QFrame>
3434
#include <QScrollArea>
3535
#include <QFile>
36+
#include <QFileInfo>
37+
#include <QDir>
3638
#include <QDialogButtonBox>
3739
#include <QUiLoader>
3840
#include <QDialog>
@@ -58,13 +60,19 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
5860
if ( !vl->editForm().isEmpty() )
5961
{
6062
QFile file( vl->editForm() );
61-
file.open( QFile::ReadOnly );
62-
QUiLoader loader;
63-
QWidget *myWidget = loader.load( &file, NULL );
64-
file.close();
6563

66-
mDialog = qobject_cast<QDialog*>( myWidget );
67-
buttonBox = myWidget->findChild<QDialogButtonBox*>();
64+
if( file.open( QFile::ReadOnly ) )
65+
{
66+
QUiLoader loader;
67+
68+
QFileInfo fi( vl->editForm() );
69+
loader.setWorkingDirectory( fi.dir() );
70+
QWidget *myWidget = loader.load( &file, NULL );
71+
file.close();
72+
73+
mDialog = qobject_cast<QDialog*>( myWidget );
74+
buttonBox = myWidget->findChild<QDialogButtonBox*>();
75+
}
6876
}
6977

7078
if ( !mDialog )

0 commit comments

Comments
 (0)