Fix/work-around Qt 5.5 issues with QMenu being used in 2 actions.

#740
This commit is contained in:
Craig Drummond
2015-11-13 23:01:50 +00:00
committed by Craig Drummond
parent 96db5b2f1d
commit 491d68f0d3
14 changed files with 189 additions and 15 deletions

View File

@@ -35,6 +35,7 @@
#include "http/httpserver.h"
#include "support/localize.h"
#include "widgets/icons.h"
#include "widgets/mirrormenu.h"
#include "devices/mountpoints.h"
#include "gui/stdactions.h"
#include "support/action.h"
@@ -43,7 +44,6 @@
#include "devices/audiocddevice.h"
#endif
#include "support/globalstatic.h"
#include <QMenu>
#include <QStringList>
#include <QMimeData>
#include <QTimer>
@@ -722,7 +722,7 @@ void DevicesModel::updateItemMenu()
}
if (!itemMenu) {
itemMenu = new QMenu(0);
itemMenu = new MirrorMenu(0);
}
itemMenu->clear();