From b7821aebd2c39ae867211f4239caf15053778eb0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 12 Sep 2016 21:52:04 +0200 Subject: [PATCH] Explicitely instantiate UI-file-based option pages --- gui/settingsdialog.cpp | 9 +++++++++ gui/settingsdialog.h | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 82756d0..3b60a8d 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -603,3 +603,12 @@ SettingsDialog::~SettingsDialog() {} } + +INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, ConnectionOptionPage) +INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, NotificationsOptionPage) +INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, AppearanceOptionPage) +INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, AutostartOptionPage) +INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, LauncherOptionPage) +#ifndef SYNCTHINGTRAY_NO_WEBVIEW +INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, WebViewOptionPage) +#endif diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h index c571059..fe0b49a 100644 --- a/gui/settingsdialog.h +++ b/gui/settingsdialog.h @@ -68,4 +68,13 @@ public: } +DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, ConnectionOptionPage) +DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, NotificationsOptionPage) +DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, AppearanceOptionPage) +DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, AutostartOptionPage) +DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, LauncherOptionPage) +#ifndef SYNCTHINGTRAY_NO_WEBVIEW +DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, WebViewOptionPage) +#endif + #endif // SETTINGS_DIALOG_H