From 68b6459e3c569c7281f8ac9ea4c89ee7d2880811 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 12 Sep 2016 21:53:18 +0200
Subject: [PATCH] Explicitely instantiate UI-file-based option pages

---
 gui/settings.cpp | 8 ++++++++
 gui/settings.h   | 9 ++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gui/settings.cpp b/gui/settings.cpp
index dc6682c..b0e1a1b 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -5,6 +5,10 @@
 
 #include "resources/config.h"
 
+#include "ui_targetpage.h"
+#include "ui_proxypage.h"
+#include "ui_useragentpage.h"
+
 #include <qtutilities/resources/resources.h>
 #include <qtutilities/settingsdialog/optioncategory.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)
diff --git a/gui/settings.h b/gui/settings.h
index 62c7bfc..68c6b7d 100644
--- a/gui/settings.h
+++ b/gui/settings.h
@@ -1,11 +1,6 @@
 #ifndef 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/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