3 files changed, 6 insertions, 7 deletions
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 11fc06b02..8a7bb7916 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -2238,12 +2238,12 @@ QMenu *FormWindow::createPopupMenu(QWidget *w)
     layoutMenu->addAction(manager->actionAdjustSize());
     layoutMenu->addAction(manager->actionHorizontalLayout());
     layoutMenu->addAction(manager->actionVerticalLayout());
-    layoutMenu->addAction(manager->actionGridLayout());
-    layoutMenu->addAction(manager->actionFormLayout());
     if (!isFormWindow) {
         layoutMenu->addAction(manager->actionSplitHorizontal());
         layoutMenu->addAction(manager->actionSplitVertical());
     }
+    layoutMenu->addAction(manager->actionGridLayout());
+    layoutMenu->addAction(manager->actionFormLayout());
     layoutMenu->addAction(manager->actionBreakLayout());
     layoutMenu->addAction(manager->actionSimplifyLayout());
 
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h
index 1d966cbcc..1d1542dc4 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.h
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.h
@@ -71,10 +71,6 @@ public:
     void setCurrentBrush(const QString &name);
 
     QPixmap brushPixmap(const QBrush &brush) const;
-signals:
-    void brushAdded(const QString &name, const QBrush &brush);
-    void brushRemoved(const QString &name);
-    void currentBrushChanged(const QString &name, const QBrush &brush);
 
 private:
     QScopedPointer<QtBrushManagerPrivate> d_ptr;
diff --git a/tools/designer/src/components/lib/lib.pro b/tools/designer/src/components/lib/lib.pro
index 92cf387cf..8d0e69266 100644
--- a/tools/designer/src/components/lib/lib.pro
+++ b/tools/designer/src/components/lib/lib.pro
@@ -64,7 +64,10 @@ PRECOMPILED_HEADER= lib_pch.h
 include(../../sharedcomponents.pri)
 include(../component.pri)
 
-unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtScript QtXml
+unix {
+    QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
+    contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
+}
 
 target.path=$$[QT_INSTALL_LIBS]
 INSTALLS        += target