Merge with develop

--HG--
branch : compatibility-develop

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;

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
 {
 

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
 			{