Commit 511ad69b authored by Dmitry Blinov's avatar Dmitry Blinov

make qt4 actually support qgtkstyle

QGtkStyle (needed for Proview-R) support in qt4 needs glib.
However, config script for qt4 is written in such a way that if glib is not
requested but QGtkStyle is requested, it just silently turns QGtkStyle off.

On the other hand, if glib is requested explicitly, then if script fails to
enable QGtkStyle it reports an error properly.
I think it was a bug in qt4 error reporting mechanism that made compilation go
smoothly even though requested QGtkStyle was never provided.
Nobody will fix it now though.

Anyway, this commit properly enables glib and fights with everything that rises
up as a result of this, leading to successfull QGtkStyle support.

https:// link just works more reliably as I found after several timeouts.
parent 7dc8fb16
......@@ -4,6 +4,7 @@ extends =
../gcc/buildout.cfg
../openssl/buildout.cfg
../dbus/buildout.cfg
../gtk-2/buildout.cfg
parts =
qt4-qmake
......@@ -86,16 +87,19 @@ pre-configure =
sed 's,/usr/X11R6/include,${libX11:location}/include ${xproto:location}/include ${libXext:location}/include,g' -i mkspecs/*/*.conf
# sed 's,/usr/local/include,${openssl-1.0:location}/include,g' -i mkspecs/*/*.conf
# sed 's,/usr/local/lib,${openssl-1.0:location}/lib,g' -i mkspecs/*/*.conf
configure-command = ./configure --prefix=${:location} -v -no-separate-debug-info -release -no-fast -confirm-license -opensource -dbus -gtkstyle -no-pch -no-rpath
configure-command = ./configure --prefix=${:location} -v -no-separate-debug-info -release -no-fast -confirm-license -opensource -dbus -glib -gtkstyle -no-pch -no-rpath -nomake demos -nomake examples -nomake docs -graphicssystem raster -no-xvideo -no-xinerama -no-xshape -no-xsync $CPPFLAGS -L${gettext:location}/lib
#make-targets = qmake
#post-install =
# cp -rt ${:location}
environment =
PATH=${pkgconfig:location}/bin:${gcc:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig
CPPFLAGS=-I${openssl-1.0:location}/include
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}
CPPFLAGS=-I${openssl-1.0:location}/include -I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${kbproto:location}/include/ -I${inputproto:location}/include/ -I${libXi:location}/include/ -I${libXrandr:location}/include/ -I${libXcursor:location}/include/ -I${xfixes:location}/include/ -I${fixesproto:location}/include/ -I${renderproto:location}/include/ -I${glproto:location}/include/
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${libXi:location}/lib -L${libXcursor:location}/lib -L${libXrandr:location}/lib -L${xfixes:location}/lib
LD_LIBRARY_PATH=${:location}__compile__/qt-everywhere-opensource-src-${:version}/lib
[qt4.8-qmake]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment