Browse Source

qt4: splitted $SDECFG_PKG_QT4_EXCEPTION_STL into $SDECFG_PKG_QT4_NO_EXCEPTIONS and $SDECFG_PKG_QT4_NO_STL (see note!)

Note:

SDECFG_PKG_QT4_NO_EXCEPTIONS
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Because Qt4 is figuring out by itself if the used compiler supports exceptions
the behavior was changed to explicitely disable exceptions.

Default: 0 (Qt will try to build with exceptions if supported by the compiler)

SDECFG_PKG_QT4_NO_STL
~~~~~~~~~~~~~~~~~~~~~

The old behavior to explicitely enable Qt4 STL support was changed this way,
that now you have to explicitely _disable_ it!

Default: 0 (Qt STL support is enabled)
user/amery/mess
Christian Wiese 15 years ago
parent
commit
b6b3240a18
  1. 8
      qt/qt4/config.in
  2. 7
      qt/qt4/qt4.conf

8
qt/qt4/config.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../qt4/config.in
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 - 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -17,8 +17,10 @@ if pkgcheck qt4 X ; then
menu_begin MENU_PKG_QT4 'Qt4 Package Options'
text 'Install prefix for Qt4' \
SDECFG_PKG_QT4_PREFIX "usr"
bool 'Enable exception and STL support' \
SDECFG_PKG_QT4_EXCEPTION_STL 0
bool 'Disable exceptions on compilers that support it' \
SDECFG_PKG_QT4_NO_EXCEPTIONS 0
bool 'Do not compile STL support' \
SDECFG_PKG_QT4_NO_STL 0
menu_end
fi

7
qt/qt4/qt4.conf

@ -96,8 +96,11 @@ var_append confopt ' ' "-nomake examples"
[[ $libdir = *lib64* ]] &&
var_append confopt ' ' '-platform linux-g++-64'
[ "$SDECFG_PKG_QT4_EXCEPTION_STL" = "0" ] &&
var_append confopt " " "-no-exceptions -no-stl"
[ "$SDECFG_PKG_QT4_NO_EXCEPTIONS" = "1" ] &&
var_append confopt " " "-no-exceptions"
[ "$SDECFG_PKG_QT4_NO_STL" = "1" ] &&
var_append confopt " " "-no-stl"
# enable QtXmlPatterns by default
var_append confopt ' ' "-xmlpatterns"

Loading…
Cancel
Save