diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-09-05 22:31:11 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-09-06 03:53:32 +0200 |
| commit | 49388bda96cd29b0cdbc9a3a7ddd51a1513dab97 (patch) | |
| tree | d4bbb384a0d46540b7cec3d40e277344a67e77cf | |
| parent | 4c626268c0bd7f548e4c23d22fc3b7d18b2f63cf (diff) | |
| download | gtk-qt-engine-49388bda96cd29b0cdbc9a3a7ddd51a1513dab97.tar.gz gtk-qt-engine-49388bda96cd29b0cdbc9a3a7ddd51a1513dab97.zip | |
Add option WITH_GCC_VISIBILITY.
Fix building with hidden visibility.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7085e78f62c562846a20b9404795034a3ad66113)
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | kcm_gtk/kcmgtk.cpp | 6 | ||||
| -rw-r--r-- | src/qt_main.c | 18 |
3 files changed, 22 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f2a0869..25178c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,12 @@ tde_setup_paths( ) set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}:${LIB_INSTALL_DIR}/pkgconfig" ) +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + ##### user requested modules option( BUILD_ALL "Build all" ON ) diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp index c2dcac0..2d35870 100644 --- a/kcm_gtk/kcmgtk.cpp +++ b/kcm_gtk/kcmgtk.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#if defined( HAVE_CONFIG_H ) +# include "config.h" +#endif + #include <tqlayout.h> #include <tdelocale.h> @@ -68,7 +72,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_gtk, KcmGtkFactory("gtk"))*/ extern "C" { - TDECModule *create_kcmgtk( TQWidget * parent, const char * name ) + KDE_EXPORT TDECModule *create_kcmgtk( TQWidget * parent, const char * name ) { TDEGlobal::locale()->insertCatalogue( "gtk-qt-engine" ); return new KcmGtk( parent, "kcmgtk" ); diff --git a/src/qt_main.c b/src/qt_main.c index fab6003..8b5bf3b 100644 --- a/src/qt_main.c +++ b/src/qt_main.c @@ -1,3 +1,8 @@ +#if defined( HAVE_CONFIG_H ) +# include "config.h" +#endif + +#include <kdemacros.h> #include <gmodule.h> #include <stdio.h> #include "qt_rc_style.h" @@ -5,25 +10,24 @@ #include "qt_qt_wrapper.h" -G_MODULE_EXPORT void theme_init (GTypeModule *module); -G_MODULE_EXPORT void theme_exit (void); -G_MODULE_EXPORT GtkRcStyle * theme_create_rc_style (void); +KDE_EXPORT void theme_init (GTypeModule *module); +KDE_EXPORT void theme_exit (void); +KDE_EXPORT GtkRcStyle * theme_create_rc_style (void); -G_MODULE_EXPORT void theme_init (GTypeModule *module) +KDE_EXPORT void theme_init (GTypeModule *module) { createTQApp(); qtengine_rc_style_register_type (module); qtengine_style_register_type (module); } -G_MODULE_EXPORT void theme_exit (void) +KDE_EXPORT void theme_exit (void) { destroyTQApp(); } -G_MODULE_EXPORT GtkRcStyle * theme_create_rc_style (void) +KDE_EXPORT GtkRcStyle * theme_create_rc_style (void) { void *ptr = GTK_RC_STYLE (g_object_new (TQTENGINE_TYPE_RC_STYLE, NULL)); return (GtkRcStyle *)ptr; } - |