1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the naming of the CFLAGS/LIBS for Gtk3

Browse Source 
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>
This commit is contained in:
Lars Knoll 2016-03-29 10:03:46 +02:00
parent 0a568e9420
commit 53412df398
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -5004,15 +5004,14 @@ fi
# auto-detect GTK style support # auto-detect GTK style support
if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then if [ -n "$PKG_CONFIG" ]; then
QMAKE_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` QMAKE_CFLAGS_GTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null`
QMAKE_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null` QMAKE_LIBS_GTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null`
QMAKE_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
fi fi
if [ -n "$QMAKE_CFLAGS_QGTK3" ] ; then if [ -n "$QMAKE_CFLAGS_GTK3" ] ; then
CFG_GTK=yes CFG_GTK=yes
QT_CONFIG="$QT_CONFIG gtk3" QT_CONFIG="$QT_CONFIG gtk3"
QMakeVar set QMAKE_CFLAGS_QGTK3 "$QMAKE_CFLAGS_QGTK3" QMakeVar set QMAKE_CFLAGS_GTK3 "$QMAKE_CFLAGS_GTK3"
QMakeVar set QMAKE_LIBS_QGTK3 "$QMAKE_LIBS_QGTK3" QMakeVar set QMAKE_LIBS_GTK3 "$QMAKE_LIBS_GTK3"
else else
if [ "$CFG_GTK" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then if [ "$CFG_GTK" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "GTK theme support cannot be enabled due to functionality tests!" echo "GTK theme support cannot be enabled due to functionality tests!"

4
src/plugins/platformthemes/gtk3/gtk3.pro
View File

@ -8,8 +8,8 @@ load(qt_plugin)
QT += core-private gui-private platformsupport-private QT += core-private gui-private platformsupport-private
CONFIG += X11 CONFIG += X11
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_QGTK3 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GTK3
LIBS += $$QMAKE_LIBS_QGTK3 LIBS += $$QMAKE_LIBS_GTK3
HEADERS += \ HEADERS += \
qgtk3dialoghelpers.h \ qgtk3dialoghelpers.h \