Merge with develop

This commit is contained in:
kervala 2016-09-18 16:35:01 +02:00
parent e68258e56e
commit 5fc7c25be4
4 changed files with 9 additions and 0 deletions

View file

@ -20,6 +20,8 @@
#include "ui_general_settings_widget.h"
#include "widget_base.h"
#include "nel/misc/types_nl.h"
class QTranslator;
/**

View file

@ -17,6 +17,9 @@
#ifndef DOWNLOADER_H
#define DOWNLOADER_H
#include <QtCore/QtCore>
#include <QtNetwork/QtNetwork>
class IOperationProgressListener;
/**

View file

@ -17,6 +17,8 @@
#ifndef OPERATION_H
#define OPERATION_H
#include <QtCore/QtCore>
class IOperationProgressListener
{
public:

View file

@ -20,6 +20,8 @@
#include "ui_uninstalldialog.h"
#include "operation.h"
class QStandardItem;
/**
* Wizard displayed when uninstalling components from Add/Remove Program under Windows
* or when user clicks on Uninstall in main menu.