diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2015-11-04 00:06:19 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2015-11-13 05:32:26 +0000 |
| commit | e8763912068f4501240cea0b5ae53b25c3d0aa04 (patch) | |
| tree | 3af530fa64b73c779349250add2f2cc60a88db9d /configure | |
| parent | f05c75a1b978336210175e80060d3083cff915c8 (diff) | |
Port the Gtk platform theme to Gtk+ 3
The major changes compared to the Gtk+ 2 version are:
* Everything is ported to modern Gtk/Gdk API.
* GtkFontChooserDialog is used instead of deprecated GtkFontSelectionDialog.
* Hiding buttons on dialogs (like OK/Cancel) is no longer supported, as it is
impossible to do that with dialogs using GtkHeaderBars.
* Some workarounds were added to the QGtk3Theme constructor to correctly work
with Gtk+ 3.
[ChangeLog][Platform Specific Changes] The Gtk+ platform theme has been ported
to Gtk+ 3.
Change-Id: Iacb01279b6432e0901e3bb1353d5792543cc76e4
Done-with: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -5205,15 +5205,15 @@ fi # auto-detect GTK style support if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null` - QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null` + QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` + QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null` QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` fi - if [ -n "$QT_CFLAGS_QGTK2" ] ; then + if [ -n "$QT_CFLAGS_QGTK3" ] ; then CFG_GTK=yes - QT_CONFIG="$QT_CONFIG gtk2" - QMakeVar set QT_CFLAGS_QGTK2 "$QT_CFLAGS_QGTK2" - QMakeVar set QT_LIBS_QGTK2 "$QT_LIBS_QGTK2" + QT_CONFIG="$QT_CONFIG gtk3" + QMakeVar set QT_CFLAGS_QGTK3 "$QT_CFLAGS_QGTK3" + QMakeVar set QT_LIBS_QGTK3 "$QT_LIBS_QGTK3" else if [ "$CFG_GTK" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo "GTK theme support cannot be enabled due to functionality tests!" |