Explicitely instantiate UI-file-based option pages
This commit is contained in:
parent
9a95707762
commit
68b6459e3c
|
@ -5,6 +5,10 @@
|
||||||
|
|
||||||
#include "resources/config.h"
|
#include "resources/config.h"
|
||||||
|
|
||||||
|
#include "ui_targetpage.h"
|
||||||
|
#include "ui_proxypage.h"
|
||||||
|
#include "ui_useragentpage.h"
|
||||||
|
|
||||||
#include <qtutilities/resources/resources.h>
|
#include <qtutilities/resources/resources.h>
|
||||||
#include <qtutilities/settingsdialog/optioncategory.h>
|
#include <qtutilities/settingsdialog/optioncategory.h>
|
||||||
#include <qtutilities/settingsdialog/optioncategorymodel.h>
|
#include <qtutilities/settingsdialog/optioncategorymodel.h>
|
||||||
|
@ -509,3 +513,7 @@ void applySettingsToDownload(Download *download)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, TargetPage)
|
||||||
|
INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, ProxyPage)
|
||||||
|
INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, UserAgentPage)
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
#ifndef SETTINGSDIALOG_H
|
#ifndef SETTINGSDIALOG_H
|
||||||
#define SETTINGSDIALOG_H
|
#define SETTINGSDIALOG_H
|
||||||
|
|
||||||
// is not required here when building with GCC 4.9.1 or Clan 3.5 - MinGW 4.9.1 fails without including UI headers here
|
|
||||||
#include "ui_targetpage.h"
|
|
||||||
#include "ui_proxypage.h"
|
|
||||||
#include "ui_useragentpage.h"
|
|
||||||
|
|
||||||
#include <qtutilities/settingsdialog/settingsdialog.h>
|
#include <qtutilities/settingsdialog/settingsdialog.h>
|
||||||
#include <qtutilities/settingsdialog/optionpage.h>
|
#include <qtutilities/settingsdialog/optionpage.h>
|
||||||
|
|
||||||
|
@ -91,4 +86,8 @@ void applySettingsToDownload(Network::Download *download);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, TargetPage)
|
||||||
|
DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, ProxyPage)
|
||||||
|
DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, UserAgentPage)
|
||||||
|
|
||||||
#endif // SETTINGSDIALOG_H
|
#endif // SETTINGSDIALOG_H
|
||||||
|
|
Loading…
Reference in New Issue