From 2455fc02d79574f43a4007b57437580d5932ff09 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 19 Sep 2016 14:52:47 +0200
Subject: [PATCH] Merge with develop

---
 code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h              | 2 ++
 code/nel/tools/3d/tile_edit_qt/tiles_model.h                | 3 +++
 .../tools/client/ryzom_installer/src/operationdialog.cpp    | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h b/code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
index 88c32bd05..993420ffa 100644
--- a/code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
+++ b/code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
@@ -19,6 +19,8 @@
 
 #include "ui_tile_edit_qt.h"
 
+#include <QtCore/QtCore>
+
 class QCheckBox;
 class QPushButton;
 class QLineEdit;
diff --git a/code/nel/tools/3d/tile_edit_qt/tiles_model.h b/code/nel/tools/3d/tile_edit_qt/tiles_model.h
index 57aee8687..de093fe09 100644
--- a/code/nel/tools/3d/tile_edit_qt/tiles_model.h
+++ b/code/nel/tools/3d/tile_edit_qt/tiles_model.h
@@ -1,6 +1,9 @@
 #ifndef TILESMODEL_H
 #define TILESMODEL_H
 
+#include <QtCore/QtCore>
+#include <QtGui/QtGui>
+
 class TileModel
 {
 
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
index 5f3215e31..82c8c66a5 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
@@ -793,14 +793,14 @@ void COperationDialog::uninstallOldClient()
 
 			if (button == QMessageBox::Yes)
 			{
+				// to not ask twice
+				CConfigFile::getInstance()->setUninstallingOldClient(true);
+
 				// remember the choice
 				CConfigFile::getInstance()->setShouldUninstallOldClient(true);
 
 				// launch old uninstaller
 				QDesktopServices::openUrl(QUrl::fromLocalFile(uninstaller));
-
-				// to not ask twice
-				CConfigFile::getInstance()->setUninstallingOldClient(true);
 			}
 			else
 			{