qtubuntu

Merge lp:~aacid/qtubuntu/fix_crash_starting_quassel into lp:qtubuntu

Proposed by Albert Astals Cid on 2017-02-16

Status:	Merged
Approved by:	Daniel d'Andrada on 2017-02-16
Approved revision:	380
Merged at revision:	373
Proposed branch:	lp:~aacid/qtubuntu/fix_crash_starting_quassel
Merge into:	lp:qtubuntu
Prerequisite:	lp:~aacid/qtubuntu/fix_crash_starting_konsole
Diff against target:	33 lines (+12/-3) 2 files modified src/ubuntuappmenu/theme.cpp (+8/-0) src/ubuntuappmenu/theme.h (+4/-3)
To merge this branch:	bzr merge lp:~aacid/qtubuntu/fix_crash_starting_quassel
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-03-01
Daniel d'Andrada (community)		2017-02-16	Approve on 2017-02-16
Review via email: mp+317471@code.launchpad.net

Implement UbuntuAppMenuTheme::createPlatformSystemTrayIcon

Using the base QGenericUnixTheme implementation makes us crash

Implement UbuntuAppMenuTheme::createPlatformSystemTrayIcon

Using the base QGenericUnixTheme implementation makes us crash

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-16:

FAILED: Continuous integration, rev:380
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/qtubuntu/fix_crash_starting_quassel/+merge/317471/+edit-commit-message

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-16:

Fixes the crash

review: Approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-16:

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-01:

review: Approve (continuous-integration)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === modified file 'src/ubuntuappmenu/theme.cpp'
 --- src/ubuntuappmenu/theme.cpp	2016-12-09 17:04:05 +0000
 +++ src/ubuntuappmenu/theme.cpp	2017-02-16 13:36:32 +0000
@@ -74,3 +74,11 @@
      if (useLocalMenu()) return QGenericUnixTheme::createPlatformMenuBar();
      return new UbuntuPlatformMenuBar();
+ }
++
++QPlatformSystemTrayIcon *UbuntuAppMenuTheme::createPlatformSystemTrayIcon() const
++{
++    // We can't use QGenericUnixTheme implementation since it needs the platformMenu to
++    // be a subclass of QDBusPlatformMenu and ours isn't
++    // TODO Investigate if we're fine with not supporting system trays or we should fix it
++    return nullptr;
++}
 === modified file 'src/ubuntuappmenu/theme.h'
 --- src/ubuntuappmenu/theme.h	2016-06-21 16:33:19 +0000
 +++ src/ubuntuappmenu/theme.h	2017-02-16 13:36:32 +0000
@@ -30,9 +30,10 @@
      QVariant themeHint(ThemeHint hint) const override;
      // For the menus
--    virtual QPlatformMenuItem* createPlatformMenuItem() const override;
--    virtual QPlatformMenu* createPlatformMenu() const override;
--    virtual QPlatformMenuBar* createPlatformMenuBar() const override;
++    QPlatformMenuItem* createPlatformMenuItem() const override;
++    QPlatformMenu* createPlatformMenu() const override;
++    QPlatformMenuBar* createPlatformMenuBar() const override;
++    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
  };
  #endif // UBUNTU_THEME_H