diff --git a/python/gui/qgscolorswatchgrid.sip b/python/gui/qgscolorswatchgrid.sip
old mode 100755
new mode 100644
diff --git a/python/gui/qgscolorwidgets.sip b/python/gui/qgscolorwidgets.sip
old mode 100755
new mode 100644
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
index 957f643f3f5..4a5a995fc02 100644
--- a/src/gui/qgsattributeform.cpp
+++ b/src/gui/qgsattributeform.cpp
@@ -387,7 +387,7 @@ void QgsAttributeForm::init()
   // Tab layout
   if ( !formWidget && mLayer->editorLayout() == QgsVectorLayer::TabLayout )
   {
-    QTabWidget* tabWidget = new QTabWidget( this );
+    QTabWidget* tabWidget = new QTabWidget();
     layout()->addWidget( tabWidget );
 
     Q_FOREACH ( QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() )
@@ -395,7 +395,8 @@ void QgsAttributeForm::init()
       QWidget* tabPage = new QWidget( tabWidget );
 
       tabWidget->addTab( tabPage, widgDef->name() );
-      QGridLayout *tabPageLayout = new QGridLayout( tabPage );
+      QGridLayout* tabPageLayout = new QGridLayout();
+      tabPage->setLayout( tabPageLayout );
 
       if ( widgDef->type() == QgsAttributeEditorElement::AeTypeContainer )
       {
@@ -645,7 +646,7 @@ QWidget* QgsAttributeForm::createWidgetFromDef( const QgsAttributeEditorElement
         newWidget = scrollArea;
       }
 
-      QGridLayout* gbLayout = new QGridLayout( myContainer );
+      QGridLayout* gbLayout = new QGridLayout();
       myContainer->setLayout( gbLayout );
 
       int index = 0;
@@ -680,7 +681,9 @@ QWidget* QgsAttributeForm::createWidgetFromDef( const QgsAttributeEditorElement
 
         ++index;
       }
-      gbLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding ), index, 0 );
+      QWidget* spacer = new QWidget();
+      spacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+      gbLayout->addWidget( spacer, index, 0 );
 
       labelText = QString::null;
       labelOnTop = true;