Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
cba648fa5a
4 changed files with 9 additions and 0 deletions
|
@ -20,6 +20,8 @@
|
||||||
#include "ui_general_settings_widget.h"
|
#include "ui_general_settings_widget.h"
|
||||||
#include "widget_base.h"
|
#include "widget_base.h"
|
||||||
|
|
||||||
|
#include "nel/misc/types_nl.h"
|
||||||
|
|
||||||
class QTranslator;
|
class QTranslator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
#ifndef DOWNLOADER_H
|
#ifndef DOWNLOADER_H
|
||||||
#define DOWNLOADER_H
|
#define DOWNLOADER_H
|
||||||
|
|
||||||
|
#include <QtCore/QtCore>
|
||||||
|
#include <QtNetwork/QtNetwork>
|
||||||
|
|
||||||
class IOperationProgressListener;
|
class IOperationProgressListener;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
#ifndef OPERATION_H
|
#ifndef OPERATION_H
|
||||||
#define OPERATION_H
|
#define OPERATION_H
|
||||||
|
|
||||||
|
#include <QtCore/QtCore>
|
||||||
|
|
||||||
class IOperationProgressListener
|
class IOperationProgressListener
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
#include "ui_uninstalldialog.h"
|
#include "ui_uninstalldialog.h"
|
||||||
#include "operation.h"
|
#include "operation.h"
|
||||||
|
|
||||||
|
class QStandardItem;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wizard displayed when uninstalling components from Add/Remove Program under Windows
|
* Wizard displayed when uninstalling components from Add/Remove Program under Windows
|
||||||
* or when user clicks on Uninstall in main menu.
|
* or when user clicks on Uninstall in main menu.
|
||||||
|
|
Loading…
Reference in a new issue