6a9a2adcb1
Qt4.6, and with many improvements. worked on by Andreas Kurzegasse, Olivier Cherrier, Daniel Dickman and with a few tweaks by myself and discussed with Daniel.
30 lines
821 B
Plaintext
30 lines
821 B
Plaintext
$OpenBSD: patch-src_frontends_qt4_Menus_cpp,v 1.1 2010/06/04 22:43:33 sthen Exp $
|
|
--- src/frontends/qt4/Menus.cpp.orig Tue Jun 9 07:53:51 2009
|
|
+++ src/frontends/qt4/Menus.cpp Fri Jun 4 13:19:13 2010
|
|
@@ -219,11 +219,7 @@ class MenuItem { (public)
|
|
MenuDefinition const & submenu() const { return submenu_.at(0); }
|
|
MenuDefinition & submenu() { return submenu_[0]; }
|
|
///
|
|
- void setSubmenu(MenuDefinition const & menu)
|
|
- {
|
|
- submenu_.clear();
|
|
- submenu_.append(menu);
|
|
- }
|
|
+ void setSubmenu(MenuDefinition const & menu);
|
|
|
|
private:
|
|
///
|
|
@@ -303,6 +299,12 @@ class MenuDefinition { (public)
|
|
QString name_;
|
|
};
|
|
|
|
+// Work around compiler bugs in gcc 3.3.
|
|
+void MenuItem::setSubmenu(MenuDefinition const & menu)
|
|
+{
|
|
+ submenu_.clear();
|
|
+ submenu_.append(menu);
|
|
+}
|
|
|
|
/// Helper for std::find_if
|
|
class MenuNamesEqual
|