Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop

This commit is contained in:
baydam
2016-01-05 12:19:38 +00:00
11 changed files with 187 additions and 277 deletions
+2 -2
View File
@@ -1693,7 +1693,7 @@ void MainWindow::createMenus()
void MainWindow::createMappingContextMenu()
{
// Context menu.
mappingContextMenu = new QMenu();
mappingContextMenu = new QMenu(this);
// Add different Action
mappingContextMenu->addAction(cloneAction);
@@ -1714,7 +1714,7 @@ void MainWindow::createMappingContextMenu()
void MainWindow::createPaintContextMenu()
{
// Paint Context Menu
paintContextMenu = new QMenu();
paintContextMenu = new QMenu(this);
// Add Actions
paintContextMenu->addAction(deletePaintAction);