Add qgis_gui.h with GUI_EXPORT macro

CMakeLists.txt

@@ -581,7 +581,6 @@ ELSE (WIN32)
 
 ENDIF(WIN32)
 
-ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")

src/app/CMakeLists.txt

@@ -525,6 +525,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QWT_INCLUDE_DIR}

src/auth/basic/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/auth/identcert/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/auth/pkipaths/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/auth/pkipkcs12/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/browser/CMakeLists.txt

@@ -66,6 +66,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GEOS_INCLUDE_DIR}

src/gui/CMakeLists.txt

@@ -789,6 +789,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/layertree
   ${CMAKE_CURRENT_SOURCE_DIR}/effects
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
   ../core
   ../core/auth
   ../core/composer
@@ -810,9 +811,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
 )
 
-REMOVE_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DGUI_EXPORT=${DLLEXPORT}\"")
-
 # disable deprecation warnings for classes re-exporting deprecated methods
 IF(MSVC)
   SET_SOURCE_FILES_PROPERTIES(
@@ -869,6 +867,14 @@ TARGET_LINK_LIBRARIES(qgis_gui
   ${QSCINTILLA_LIBRARY}
 )
 
+GENERATE_EXPORT_HEADER(
+   qgis_gui
+   BASE_NAME GUI
+   EXPORT_FILE_NAME qgis_gui.h
+)
+
+SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${PROJECT_BINARY_DIR}/qgis_gui.h)
+
 IF(WIN32)
   ADD_DEFINITIONS(-DQWT_DLL)
   ADD_DEFINITIONS(-DQSCINTILLA_DLL)

src/gui/attributetable/qgsattributetabledelegate.h

@@ -17,6 +17,7 @@
 #define QGSATTRIBUTETABLEDELEGATE_H
 
 #include <QItemDelegate>
+#include "qgis_gui.h"
 
 class QgsFeatureSelectionModel;
 class QPainter;

src/gui/attributetable/qgsattributetablefiltermodel.h

@@ -22,6 +22,7 @@
 
 #include "qgsattributetablemodel.h"
 #include "qgsfeaturemodel.h"
+#include "qgis_gui.h"
 
 class QgsVectorLayerCache;
 class QgsMapCanvas;

src/gui/attributetable/qgsattributetablemodel.h

@@ -28,6 +28,7 @@
 #include "qgsconditionalstyle.h"
 #include "qgsattributeeditorcontext.h"
 #include "qgsvectorlayercache.h"
+#include "qgis_gui.h"
 
 class QgsMapCanvas;
 class QgsMapLayerAction;

src/gui/attributetable/qgsattributetableview.h

@@ -20,6 +20,7 @@
 #include <QAction>
 
 #include "qgsfeature.h" // For QgsFeatureIds
+#include "qgis_gui.h"
 
 class QgsAttributeTableDelegate;
 class QgsAttributeTableFilterModel;

src/gui/attributetable/qgsdualview.h

@@ -24,6 +24,7 @@
 #include "qgsattributetablefiltermodel.h"
 #include "qgsdistancearea.h"
 #include "qgsattributeform.h"
+#include "qgis_gui.h"
 
 class QgsFeatureRequest;
 class QSignalMapper;

src/gui/attributetable/qgsfeaturelistmodel.h

@@ -23,6 +23,7 @@
 
 #include "qgsfeaturemodel.h"
 #include "qgsfeature.h" // QgsFeatureId
+#include "qgis_gui.h"
 
 class QgsAttributeTableFilterModel;
 class QgsAttributeTableModel;

src/gui/attributetable/qgsfeaturelistview.h

@@ -20,6 +20,7 @@
 #include <qdebug.h>
 
 #include "qgsfeature.h" // For QgsFeatureIds
+#include "qgis_gui.h"
 
 class QgsAttributeTableFilterModel;
 class QgsFeatureListModel;

src/gui/attributetable/qgsfeaturelistviewdelegate.h

@@ -17,6 +17,7 @@
 
 #include <QItemDelegate>
 #include <QItemSelectionModel>
+#include "qgis_gui.h"
 
 class QgsVectorLayer;
 class QgsFeatureListModel;

src/gui/attributetable/qgsfeatureselectionmodel.h

@@ -18,6 +18,7 @@
 #include <QItemSelectionModel>
 
 #include "qgsfeature.h"
+#include "qgis_gui.h"
 
 class QgsVectorLayer;
 class QgsFeatureModel;

src/gui/attributetable/qgsfieldconditionalformatwidget.h

@@ -24,6 +24,7 @@
 
 #include "ui_qgsfieldconditionalformatwidget.h"
 #include "qgsconditionalstyle.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsFieldConditionalFormatWidget

src/gui/attributetable/qgsgenericfeatureselectionmanager.h

@@ -18,6 +18,7 @@
 
 #include "qgsfeature.h"
 #include "qgsifeatureselectionmanager.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * This selection manager synchronizes a local set of selected features with an attribute table.

src/gui/attributetable/qgsifeatureselectionmanager.h

@@ -19,6 +19,7 @@
 #include <QObject>
 
 #include "qgsfeature.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Is an interface class to abstract feature selection handling.

src/gui/attributetable/qgsorganizetablecolumnsdialog.h

@@ -22,6 +22,7 @@
 #include "ui_qgsorganizetablecolumnsdialog.h"
 
 #include "qgsattributetableconfig.h"
+#include "qgis_gui.h"
 
 class QgsVectorLayer;
 

src/gui/attributetable/qgsvectorlayerselectionmanager.h

@@ -17,6 +17,7 @@
 #define QGSVECTORLAYERSELECTIONMANAGER_H
 
 #include "qgsifeatureselectionmanager.h"
+#include "qgis_gui.h"
 
 class QgsVectorLayer;
 

src/gui/auth/qgsauthauthoritieseditor.h

@@ -23,6 +23,7 @@
 #include "ui_qgsauthauthoritieseditor.h"
 #include "qgsauthcertutils.h"
 #include "qgsauthmanager.h"
+#include "qgis_gui.h"
 
 class QgsMessageBar;
 class QMenu;

src/gui/auth/qgsauthcertificateinfo.h

@@ -29,6 +29,7 @@
 #include <QWidget>
 #include "ui_qgsauthcertificateinfo.h"
 #include "qgsauthcertutils.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Widget for viewing detailed info on a certificate and its hierarchical trust chain

src/gui/auth/qgsauthcertificatemanager.h

@@ -21,6 +21,7 @@
 
 #include <QWidget>
 #include <QDialog>
+#include "qgis_gui.h"
 
 
 /** \ingroup gui

src/gui/auth/qgsauthcerttrustpolicycombobox.h

@@ -19,6 +19,7 @@
 
 #include <QComboBox>
 #include "qgsauthcertutils.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Widget for editing the trust policy associated with a Certificate (Intermediate) Authority

src/gui/auth/qgsauthconfigedit.h

@@ -21,6 +21,7 @@
 #include <QDialog>
 
 #include "ui_qgsauthconfigedit.h"
+#include "qgis_gui.h"
 
 class QgsAuthMethodEdit;
 

src/gui/auth/qgsauthconfigeditor.h

@@ -22,6 +22,7 @@
 
 #include "ui_qgsauthconfigeditor.h"
 #include "qgsauthmanager.h"
+#include "qgis_gui.h"
 
 class QgsMessageBar;
 

src/gui/auth/qgsauthconfigidedit.h

@@ -20,6 +20,7 @@
 #include "ui_qgsauthconfigidedit.h"
 
 #include <QWidget>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \brief Custom widget for editing an authentication configuration ID

src/gui/auth/qgsauthconfigselect.h

@@ -21,6 +21,7 @@
 
 #include "ui_qgsauthconfigselect.h"
 #include "qgsauthconfig.h"
+#include "qgis_gui.h"
 
 
 /** \ingroup gui

src/gui/auth/qgsautheditorwidgets.h

@@ -20,6 +20,7 @@
 #include <QWidget>
 #include "ui_qgsautheditorwidgets.h"
 #include "ui_qgsauthmethodplugins.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Dialog for viewing available authentication method plugins

src/gui/auth/qgsauthguiutils.h

@@ -18,6 +18,7 @@
 #define QGSAUTHGUIUTILS_H
 
 #include <QColor>
+#include "qgis_gui.h"
 
 class QWidget;
 class QgsMessageBar;

src/gui/auth/qgsauthidentitieseditor.h

@@ -22,6 +22,7 @@
 
 #include "ui_qgsauthidentitieseditor.h"
 #include "qgsauthmanager.h"
+#include "qgis_gui.h"
 
 class QgsMessageBar;
 

src/gui/auth/qgsauthimportcertdialog.h

@@ -21,6 +21,7 @@
 #include "ui_qgsauthimportcertdialog.h"
 
 #include <QSslCertificate>
+#include "qgis_gui.h"
 
 class QPushButton;
 

src/gui/auth/qgsauthimportidentitydialog.h

@@ -24,6 +24,7 @@
 #include <QSslKey>
 
 #include "qgsauthconfig.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Widget for importing an identity certificate/key bundle into the authentication database

src/gui/auth/qgsauthmasterpassresetdialog.h

@@ -20,6 +20,7 @@
 #include <QDialog>
 
 #include "ui_qgsauthmasterpassresetdialog.h"
+#include "qgis_gui.h"
 
 class QLabel;
 class QVBoxLayout;

src/gui/auth/qgsauthmethodedit.h

@@ -20,6 +20,7 @@
 #include <QWidget>
 
 #include "qgis.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Abstract base class for the edit widget of authentication method plugins

src/gui/auth/qgsauthserverseditor.h

@@ -21,6 +21,7 @@
 
 #include "ui_qgsauthserverseditor.h"
 #include "qgsauthmanager.h"
+#include "qgis_gui.h"
 
 class QgsMessageBar;
 

src/gui/auth/qgsauthsslconfigwidget.h

@@ -25,6 +25,7 @@
 #include <QSslConfiguration>
 
 #include "qgsauthconfig.h"
+#include "qgis_gui.h"
 
 class QComboBox;
 class QGroupBox;

src/gui/auth/qgsauthsslerrorsdialog.h

@@ -21,6 +21,7 @@
 #include <QDialog>
 #include <QSslError>
 #include "ui_qgsauthsslerrorsdialog.h"
+#include "qgis_gui.h"
 
 class QNetworkReply;
 class QPushButton;

src/gui/auth/qgsauthsslimportdialog.h

@@ -67,6 +67,7 @@
 #include <QDialog>
 #include <QAbstractSocket>
 #include <QSslSocket>
+#include "qgis_gui.h"
 
 class QPushButton;
 class QSslSocket;

src/gui/auth/qgsauthtrustedcasdialog.h

@@ -23,6 +23,7 @@
 #include <QSslCertificate>
 
 #include "qgsauthmanager.h"
+#include "qgis_gui.h"
 
 class QgsMessageBar;
 

src/gui/editorwidgets/core/qgseditorconfigwidget.h

@@ -17,6 +17,7 @@
 #define QGSEDITORCONFIGWIDGET_H
 
 #include <QWidget>
+#include "qgis_gui.h"
 
 
 class QgsVectorLayer;

src/gui/editorwidgets/core/qgseditorwidgetautoconf.h

@@ -17,6 +17,7 @@
 
 #include <QList>
 #include <QSharedPointer>
+#include "qgis_gui.h"
 
 class QgsVectorLayer;
 class QgsEditorWidgetSetup;
@@ -88,4 +89,4 @@ class GUI_EXPORT QgsEditorWidgetAutoConf
 };
 ///@endcond
 
-#endif // QGSEDITORWIDGETAUTOCONF_H
+#endif // QGSEDITORWIDGETAUTOCONF_H

src/gui/editorwidgets/core/qgseditorwidgetfactory.h

@@ -20,6 +20,7 @@
 #include <QMap>
 #include <QString>
 #include <QVariant>
+#include "qgis_gui.h"
 
 class QgsEditorConfigWidget;
 class QgsEditorWidgetWrapper;

src/gui/editorwidgets/core/qgseditorwidgetregistry.h

@@ -21,6 +21,7 @@
 #include "qgseditorwidgetfactory.h"
 #include "qgsattributeeditorcontext.h"
 #include "qgseditorwidgetautoconf.h"
+#include "qgis_gui.h"
 
 class QgsMapLayer;
 class QDomNode;

src/gui/editorwidgets/core/qgseditorwidgetwrapper.h

@@ -24,6 +24,7 @@ class QgsVectorLayer;
 class QgsField;
 
 #include "qgswidgetwrapper.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Manages an editor widget

src/gui/editorwidgets/core/qgssearchwidgetwrapper.h

@@ -25,6 +25,7 @@ class QgsField;
 
 #include "qgsattributeeditorcontext.h"
 #include "qgswidgetwrapper.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Manages an editor widget

src/gui/editorwidgets/core/qgswidgetwrapper.h

@@ -23,6 +23,7 @@
 class QgsVectorLayer;
 
 #include "qgsattributeeditorcontext.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Manages an editor widget

src/gui/editorwidgets/qgscheckboxconfigdlg.h

@@ -19,6 +19,7 @@
 #include "ui_qgscheckboxconfigdlgbase.h"
 
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsCheckBoxConfigDlg

src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h

@@ -21,6 +21,7 @@
 #include <QComboBox>
 #include <QListWidget>
 #include <QLineEdit>
+#include "qgis_gui.h"
 class QCheckBox;
 
 class QgsCheckboxWidgetFactory;

src/gui/editorwidgets/qgscheckboxwidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSCHECKBOXWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsCheckboxWidgetFactory

src/gui/editorwidgets/qgscheckboxwidgetwrapper.h

@@ -20,6 +20,7 @@
 
 #include <QCheckBox>
 #include <QGroupBox>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Wraps a checkbox widget. This will offer a checkbox to represent boolean values.

src/gui/editorwidgets/qgsclassificationwidgetwrapper.h

@@ -19,6 +19,7 @@
 #include "qgseditorwidgetwrapper.h"
 
 #include <QComboBox>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsClassificationWidgetWrapper

src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.h

@@ -17,6 +17,7 @@
 #define QGSCLASSIFICATIONWIDGETWRAPPERFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsClassificationWidgetWrapperFactory

src/gui/editorwidgets/qgscolorwidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSCOLORWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsColorWidgetFactory

src/gui/editorwidgets/qgscolorwidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSCOLORWIDGETWRAPPER_H
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsColorButton;
 

src/gui/editorwidgets/qgsdatetimeedit.h

@@ -17,6 +17,7 @@
 #define QGSDATETIMEEDIT_H
 
 #include <QDateTimeEdit>
+#include "qgis_gui.h"
 
 class QToolButton;
 class QLineEdit;

src/gui/editorwidgets/qgsdatetimeeditconfig.h

@@ -18,6 +18,7 @@
 
 #include "qgseditorconfigwidget.h"
 #include "ui_qgsdatetimeeditconfig.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsDateTimeEditConfig

src/gui/editorwidgets/qgsdatetimeeditfactory.h

@@ -17,6 +17,7 @@
 #define QGSDATETIMEEDITFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsDateTimeEditFactory

src/gui/editorwidgets/qgsdatetimeeditwrapper.h

@@ -19,6 +19,7 @@
 #include <QDateTimeEdit>
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsDateTimeEdit;
 

src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h

@@ -21,6 +21,7 @@
 #include <QComboBox>
 #include <QListWidget>
 #include <QLineEdit>
+#include "qgis_gui.h"
 
 class QgsDateTimeEditFactory;
 class QgsDateTimeEdit;

src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h

@@ -20,6 +20,7 @@
 #include "qgsfilterlineedit.h"
 
 #include <QCheckBox>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Wraps a search widget. Default form is just a QgsLineFilterEdit

src/gui/editorwidgets/qgsdoublespinbox.h

@@ -17,6 +17,7 @@
 #define QGSDOUBLESPINBOX_H
 
 #include <QDoubleSpinBox>
+#include "qgis_gui.h"
 
 class QgsSpinBoxLineEdit;
 

src/gui/editorwidgets/qgsdummyconfigdlg.h

@@ -18,6 +18,7 @@
 
 #include "ui_qgsdummyconfigdlgbase.h"
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 
 /** \ingroup gui

src/gui/editorwidgets/qgsenumerationwidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSENUMERATIONWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsEnumerationWidgetFactory

src/gui/editorwidgets/qgsenumerationwidgetwrapper.h

@@ -19,6 +19,7 @@
 #include "qgseditorwidgetwrapper.h"
 
 #include <QComboBox>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsEnumerationWidgetWrapper

src/gui/editorwidgets/qgsexternalresourceconfigdlg.h

@@ -19,6 +19,7 @@
 #include "ui_qgsexternalresourceconfigdlg.h"
 
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsExternalResourceConfigDlg

src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h

@@ -18,6 +18,7 @@
 #define QGSEXTERNALRESOURCEWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 
 /** \ingroup gui

src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.h

@@ -22,6 +22,7 @@ class QLabel;
 class QLineEdit;
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 
 

src/gui/editorwidgets/qgsfilenamewidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSFILENAMEWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsFileNameWidgetFactory

src/gui/editorwidgets/qgsfilenamewidgetwrapper.h

@@ -21,6 +21,7 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QLabel>
+#include "qgis_gui.h"
 
 
 /** \ingroup gui

src/gui/editorwidgets/qgshiddenwidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSHIDDENWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsHiddenWidgetFactory

src/gui/editorwidgets/qgshiddenwidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSHIDDENWIDGETWRAPPER_H
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Wraps a hidden widget. Fields with this widget type will not be visible.

src/gui/editorwidgets/qgskeyvaluewidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSKEYVALUEEDITFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** @ingroup gui
  * Factory for widgets for editing a QVariantMap

src/gui/editorwidgets/qgskeyvaluewidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSKEYVALUEWIDGETWRAPPER_H
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsKeyValueWidget;
 

src/gui/editorwidgets/qgslistwidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSLISTWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** @ingroup gui
  * Factory for widgets for editing a QVariantList or a QStringList

src/gui/editorwidgets/qgslistwidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSLISTWIDGETWRAPPER_H
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsListWidget;
 

src/gui/editorwidgets/qgsmultiedittoolbutton.h

@@ -18,6 +18,7 @@
 
 #include "qgsfields.h"
 #include <QToolButton>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsMultiEditToolButton

src/gui/editorwidgets/qgsphotoconfigdlg.h

@@ -19,6 +19,7 @@
 #include "ui_qgsphotoconfigdlgbase.h"
 
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsPhotoConfigDlg

src/gui/editorwidgets/qgsphotowidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSPHOTOWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsPhotoWidgetFactory

src/gui/editorwidgets/qgsphotowidgetwrapper.h

@@ -24,6 +24,7 @@
 
 #ifdef WITH_QTWEBKIT
 #include <QWebView>
+#include "qgis_gui.h"
 #endif
 
 class QgsPixmapLabel;

src/gui/editorwidgets/qgsrangeconfigdlg.h

@@ -18,6 +18,7 @@
 
 #include "ui_qgsrangeconfigdlgbase.h"
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsRangeConfigDlg

src/gui/editorwidgets/qgsrangewidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSRANGEWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsRangeWidgetFactory

src/gui/editorwidgets/qgsrangewidgetwrapper.h

@@ -20,6 +20,7 @@
 
 #include <QSpinBox>
 #include <QDoubleSpinBox>
+#include "qgis_gui.h"
 
 class QAbstractSlider;
 class QSlider;

src/gui/editorwidgets/qgsrelationreferenceconfigdlg.h

@@ -20,6 +20,7 @@
 
 #include "ui_qgsrelationreferenceconfigdlgbase.h"
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsRelationReferenceConfigDlg

src/gui/editorwidgets/qgsrelationreferencefactory.h

@@ -18,6 +18,7 @@
 
 #include "qgsattributeeditorcontext.h"
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 class QgsMapCanvas;
 class QgsMessageBar;

src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.h

@@ -21,6 +21,7 @@
 #include <QComboBox>
 #include <QListWidget>
 #include <QLineEdit>
+#include "qgis_gui.h"
 
 class QgsRelationReferenceWidgetFactory;
 class QgsMapCanvas;

src/gui/editorwidgets/qgsrelationreferencewidget.h

@@ -24,6 +24,7 @@
 #include <QLineEdit>
 #include <QHBoxLayout>
 #include <QStandardItemModel>
+#include "qgis_gui.h"
 
 class QgsAttributeForm;
 class QgsVectorLayerTools;

src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSRELATIONREFERENCEWIDGETWRAPPER_H
 
 #include "qgseditorwidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsRelationReferenceWidget;
 class QgsMapCanvas;

src/gui/editorwidgets/qgsrelationwidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSRELATIONWIDGETWRAPPER_H
 
 #include "qgswidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsRelationEditorWidget;
 

src/gui/editorwidgets/qgssearchwidgettoolbutton.h

@@ -18,6 +18,7 @@
 
 #include "editorwidgets/core/qgssearchwidgetwrapper.h"
 #include <QToolButton>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsSearchWidgetToolButton

src/gui/editorwidgets/qgsspinbox.h

@@ -17,6 +17,7 @@
 #define QGSSPINBOX_H
 
 #include <QSpinBox>
+#include "qgis_gui.h"
 
 class QgsSpinBoxLineEdit;
 

src/gui/editorwidgets/qgstexteditconfigdlg.h

@@ -19,6 +19,7 @@
 #include "ui_qgstexteditconfigdlg.h"
 
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsTextEditConfigDlg

src/gui/editorwidgets/qgstexteditsearchwidgetwrapper.h

@@ -17,6 +17,7 @@
 #define QGSTEXTEDITSEARCHWIDGETWRAPPER_H
 
 #include "qgsdefaultsearchwidgetwrapper.h"
+#include "qgis_gui.h"
 
 class QgsTextEditWidgetFactory;
 

src/gui/editorwidgets/qgstexteditwidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSTEXTEDITWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsTextEditWidgetFactory

src/gui/editorwidgets/qgstexteditwrapper.h

@@ -21,6 +21,7 @@
 #include <QLineEdit>
 #include <QPlainTextEdit>
 #include <QTextEdit>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Wraps a text widget. Users will be able to modify text with this widget type.

src/gui/editorwidgets/qgsuniquevaluesconfigdlg.h

@@ -19,6 +19,7 @@
 #include "ui_qgsuniquevaluesconfigdlgbase.h"
 
 #include "qgseditorconfigwidget.h"
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * \class QgsUniqueValuesConfigDlg

src/gui/editorwidgets/qgsuniquevaluewidgetfactory.h

@@ -17,6 +17,7 @@
 #define QGSUNIQUEVALUEWIDGETFACTORY_H
 
 #include "qgseditorwidgetfactory.h"
+#include "qgis_gui.h"
 
 /**
  * \ingroup gui

src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.h

@@ -20,6 +20,7 @@
 
 #include <QComboBox>
 #include <QLineEdit>
+#include "qgis_gui.h"
 
 /** \ingroup gui
  * Wraps a unique value widget. Will offer any value previously used for this field.