Skip to content

Commit 2f35e16

Browse files
m-kuhnm-kuhn
committedJan 4, 2017
Add qgis_customwidgets with CUSTOMWIDGETS_EXPORT macro
1 parent 1693140 commit 2f35e16

22 files changed

+32
-9
lines changed
 

‎CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,6 @@ ELSE (WIN32)
581581

582582
ENDIF(WIN32)
583583

584-
ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
585-
586584
SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
587585
INCLUDE(GenerateExportHeader)
588586

‎src/customwidgets/CMakeLists.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ FIND_PACKAGE(Qt5Designer REQUIRED)
77

88
SET(QT_USE_QTDESIGNER ON)
99

10-
11-
REMOVE_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
12-
ADD_DEFINITIONS("\"-DCUSTOMWIDGETS_EXPORT=${DLLEXPORT}\"")
13-
1410
########################################################
1511
# Files
1612

@@ -107,6 +103,7 @@ INCLUDE_DIRECTORIES(
107103
${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/
108104
${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/core
109105
${CMAKE_BINARY_DIR}/src/core
106+
${CMAKE_BINARY_DIR}/src/customwidgets
110107
${CMAKE_CURRENT_BINARY_DIR}/../ui/
111108
)
112109
INCLUDE_DIRECTORIES(SYSTEM
@@ -126,9 +123,6 @@ QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
126123

127124
ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_HDRS} ${IMAGE_RCC_SRCS})
128125

129-
# TODO: apple
130-
INSTALL(FILES ${QGIS_CUSTOMWIDGETS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
131-
132126
SET_TARGET_PROPERTIES(qgis_customwidgets PROPERTIES
133127
VERSION ${COMPLETE_VERSION}
134128
SOVERSION ${COMPLETE_VERSION}
@@ -139,8 +133,19 @@ ADD_DEPENDENCIES(qgis_customwidgets ui)
139133

140134
TARGET_LINK_LIBRARIES(qgis_customwidgets qgis_gui)
141135

136+
GENERATE_EXPORT_HEADER(
137+
qgis_customwidgets
138+
BASE_NAME CUSTOMWIDGETS
139+
EXPORT_FILE_NAME qgis_customwidgets.h
140+
)
141+
142+
SET(QGIS_CUSTOMWIDGETS_HDRS ${QGIS_CUSTOMWIDGETS_HDRS} ${PROJECT_BINARY_DIR}/qgis_customwidgets.h)
143+
142144
# install
143145
INSTALL(TARGETS qgis_customwidgets
144146
RUNTIME DESTINATION ${QT_PLUGINS_DIR}/designer
145147
LIBRARY DESTINATION ${QT_PLUGINS_DIR}/designer
146148
)
149+
150+
# TODO: apple
151+
INSTALL(FILES ${QGIS_CUSTOMWIDGETS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})

‎src/customwidgets/qgscollapsiblegroupboxplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930
class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgscolorbuttonplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsdatadefinedbuttonplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsdatetimeeditplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsdockwidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930
class CUSTOMWIDGETS_EXPORT QgsDockWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdoublespinboxplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsexpressionbuilderwidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsextentgroupboxplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsexternalresourcewidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsfieldcomboboxplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsfieldexpressionwidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsfilewidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsfilterlineeditplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsmaplayercomboboxplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsprojectionselectionwidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsrelationeditorwidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsrelationreferencewidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsscalerangewidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsscalewidgetplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#else
2525
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2626
#include <QtUiPlugin/QDesignerExportWidget>
27+
#include "qgis_customwidgets.h"
2728
#endif
2829

2930

‎src/customwidgets/qgsspinboxplugin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#else
2424
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2525
#include <QtUiPlugin/QDesignerExportWidget>
26+
#include "qgis_customwidgets.h"
2627
#endif
2728

2829

0 commit comments

Comments
 (0)