Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-09-19 14:52:47 +02:00
commit 0037b40751
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
View file

@ -19,6 +19,8 @@
#include "ui_tile_edit_qt.h" #include "ui_tile_edit_qt.h"
#include <QtCore/QtCore>
class QCheckBox; class QCheckBox;
class QPushButton; class QPushButton;
class QLineEdit; class QLineEdit;

3
code/nel/tools/3d/tile_edit_qt/tiles_model.h
View file

@ -1,6 +1,9 @@
#ifndef TILESMODEL_H #ifndef TILESMODEL_H
#define TILESMODEL_H #define TILESMODEL_H
#include <QtCore/QtCore>
#include <QtGui/QtGui>
class TileModel class TileModel
{ {

6
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -793,14 +793,14 @@ void COperationDialog::uninstallOldClient()
if (button == QMessageBox::Yes) if (button == QMessageBox::Yes)
{ {
// to not ask twice
CConfigFile::getInstance()->setUninstallingOldClient(true);
// remember the choice // remember the choice
CConfigFile::getInstance()->setShouldUninstallOldClient(true); CConfigFile::getInstance()->setShouldUninstallOldClient(true);
// launch old uninstaller // launch old uninstaller
QDesktopServices::openUrl(QUrl::fromLocalFile(uninstaller)); QDesktopServices::openUrl(QUrl::fromLocalFile(uninstaller));
// to not ask twice
CConfigFile::getInstance()->setUninstallingOldClient(true);
} }
else else
{ {