From 53412df398445651c1886b7acbed9d4e38a34b2f Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Tue, 29 Mar 2016 10:03:46 +0200
Subject: [PATCH] Fix the naming of the CFLAGS/LIBS for Gtk3

The feature is called gtk3, so the naming of the CFLAGS/LIBS should reflect that.
At the same time, remove the unused QMAKE_LIBS_QGOBJECT variable.

Change-Id: I565a098aaa80f380de0da534d058f315e77a33f6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure                                | 11 +++++------
 src/plugins/platformthemes/gtk3/gtk3.pro |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 72f2023d664..a28f9853761 100755
--- a/configure
+++ b/configure
@@ -5004,15 +5004,14 @@ fi
 # auto-detect GTK style support
 if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then
     if [ -n "$PKG_CONFIG" ]; then
-        QMAKE_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null`
-        QMAKE_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null`
-        QMAKE_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
+        QMAKE_CFLAGS_GTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null`
+        QMAKE_LIBS_GTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null`
     fi
-    if [ -n "$QMAKE_CFLAGS_QGTK3" ] ; then
+    if [ -n "$QMAKE_CFLAGS_GTK3" ] ; then
         CFG_GTK=yes
         QT_CONFIG="$QT_CONFIG gtk3"
-        QMakeVar set QMAKE_CFLAGS_QGTK3 "$QMAKE_CFLAGS_QGTK3"
-        QMakeVar set QMAKE_LIBS_QGTK3 "$QMAKE_LIBS_QGTK3"
+        QMakeVar set QMAKE_CFLAGS_GTK3 "$QMAKE_CFLAGS_GTK3"
+        QMakeVar set QMAKE_LIBS_GTK3 "$QMAKE_LIBS_GTK3"
     else
         if [ "$CFG_GTK" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
             echo "GTK theme support cannot be enabled due to functionality tests!"
diff --git a/src/plugins/platformthemes/gtk3/gtk3.pro b/src/plugins/platformthemes/gtk3/gtk3.pro
index ba459843f0d..557918c5a4a 100644
--- a/src/plugins/platformthemes/gtk3/gtk3.pro
+++ b/src/plugins/platformthemes/gtk3/gtk3.pro
@@ -8,8 +8,8 @@ load(qt_plugin)
 QT += core-private gui-private platformsupport-private
 
 CONFIG += X11
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_QGTK3
-LIBS += $$QMAKE_LIBS_QGTK3
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GTK3
+LIBS += $$QMAKE_LIBS_GTK3
 
 HEADERS += \
         qgtk3dialoghelpers.h \