From 842a0b094befeb6f023782da02e1ee649490091e Mon Sep 17 00:00:00 2001
From: Morten Johan Sorvig <morten.sorvig@nokia.com>
Date: Tue, 24 Apr 2012 14:23:02 +0200
Subject: Make QGtkStyle work on Qt 5.

Mostly straightforward porting: Add configure test from Qt 4. Add X11
include to qgtkstyle_p.cpp. Use renamed QGuiApplicationPrivate::showModalWindow.

Change-Id: I83020e13ec00b49f3fe346814f881bce19a6f602
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/widgets/styles/styles.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/widgets/styles/styles.pri')

diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri
index 2ae9664230..91212f0178 100644
--- a/src/widgets/styles/styles.pri
+++ b/src/widgets/styles/styles.pri
@@ -39,7 +39,7 @@ contains( styles, all ) {
 
 !macx-*|ios:styles -= mac
 
-x11{
+contains(QT_CONFIG, gtkstyle) {
     QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE
     LIBS_PRIVATE += $$QT_LIBS_QGTKSTYLE
     styles += gtk
-- 
cgit v1.2.3