diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2013-05-17 21:59:33 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 23:57:16 +0200 |
| commit | d1ad5d6b46225725b97e425cdc31675d29676e5d (patch) | |
| tree | 5d8e2ea59feef95dd752e3a636c2b4976101a035 /src | |
| parent | 77c021636966530bed8187b3f5f00f0c5a04230f (diff) | |
Do not call g_type_init() with GLib >= 2.36
g_type_init() is deprecated and the type system is now initialized
automatically.
Change-Id: I5bf5702136cc948dea0a55676dfee2486f12ca00
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/styles/qgtkstyle_p.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp index a53a961a89..769d822108 100644 --- a/src/widgets/styles/qgtkstyle_p.cpp +++ b/src/widgets/styles/qgtkstyle_p.cpp @@ -641,7 +641,9 @@ QString QGtkStylePrivate::getGConfString(const QString &value, const QString &fa { QString retVal = fallback; if (resolveGConf()) { +#if !defined(GLIB_VERSION_2_36) g_type_init(); +#endif GConfClient* client = gconf_client_get_default(); GError *err = 0; char *str = gconf_client_get_string(client, qPrintable(value), &err); @@ -660,7 +662,9 @@ bool QGtkStylePrivate::getGConfBool(const QString &key, bool fallback) { bool retVal = fallback; if (resolveGConf()) { +#if !defined(GLIB_VERSION_2_36) g_type_init(); +#endif GConfClient* client = gconf_client_get_default(); GError *err = 0; bool result = gconf_client_get_bool(client, qPrintable(key), &err); |