Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=982ba71a57edd295faadc172ead6ea9879716f3b

commit 982ba71a57edd295faadc172ead6ea9879716f3b
Author: Devil505 <devil505li...@gmail.com>
Date:   Thu Aug 25 23:05:42 2011 +0200

qt4-4.7.3-4-i686
* added patch: 16_qt-designer-toplevel-mode-menubar.diff

diff --git a/source/xlib-extra/qt4/16_qt-designer-toplevel-mode-menubar.diff 
b/source/xlib-extra/qt4/16_qt-designer-toplevel-mode-menubar.diff
new file mode 100644
index 0000000..0ed563d
--- /dev/null
+++ b/source/xlib-extra/qt4/16_qt-designer-toplevel-mode-menubar.diff
@@ -0,0 +1,29 @@
+Index: b/tools/designer/src/designer/qdesigner_workbench.cpp
+===================================================================
+--- a/tools/designer/src/designer/qdesigner_workbench.cpp      2010-09-15 
19:50:53.111255003 +0200
++++ b/tools/designer/src/designer/qdesigner_workbench.cpp      2010-09-15 
19:51:03.255255002 +0200
+@@ -410,6 +410,9 @@
+
+     switchToNeutralMode();
+
++#ifdef Q_WS_X11
++    QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, false);
++#endif
+ #ifndef Q_WS_MAC
+     QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
+     widgetBoxWrapper->action()->setVisible(true);
+@@ -477,6 +480,14 @@
+     // The widget box is special, it gets the menubar and gets to be the main 
widget.
+
+     m_core->setTopLevel(widgetBoxWrapper);
++#ifdef Q_WS_X11
++    // For now the appmenu protocol does not make it possible to associate a
++    // menubar with all application windows. This means in top level mode you
++    // can only reach the menubar when the widgetbox window is active. Since
++    // this is quite inconvenient, better not use the native menubar in this
++    // configuration and keep the menubar in the widgetbox window.
++    QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
++#endif
+ #ifndef Q_WS_MAC
+     widgetBoxWrapper->setMenuBar(m_globalMenuBar);
+     widgetBoxWrapper->action()->setVisible(false);
diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index 91c7504..aefae80 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -7,7 +7,7 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}
pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
pkgver=4.7.3
-pkgrel=3
+pkgrel=4
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
@@ -21,9 +21,11 @@ options=('scriptlet' 'nodocs')
_F_archive_grepv="-tp"
up2date="Flasttar ftp://ftp.qt.nokia.com/qt/source/";
source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \
+        16_qt-designer-toplevel-mode-menubar.diff \
frugalware.patch \
fix-config.tests.patch)
sha1sums=('765eb70d9779f93fefddddda5e6ddb33f4c0b71e' \
+          '2391d180dea337fd5230273e0f1adda43491cc19' \
'8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to