diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-15 06:16:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-15 06:16:08 (GMT) |
| commit | 191a716c0618fcaf6450389fc5ad133d787b53f3 (patch) | |
| tree | 7f4b31c9d8ea457374bdd84baf19d4e5cbd4c155 /configure | |
| parent | abbfbdacbc9abd0f2a0c0341be2a75352afb0205 (diff) | |
| parent | c5ae0ffd52ee3f2964404bf85dee55712fb6bd8c (diff) | |
| download | Qt-191a716c0618fcaf6450389fc5ad133d787b53f3.zip Qt-191a716c0618fcaf6450389fc5ad133d787b53f3.tar.gz Qt-191a716c0618fcaf6450389fc5ad133d787b53f3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add an image allocation pool to the OpenVG paint engine
Fix QMetaObject::connect and disconnect with "dynamic signals"
Test fixed for Windows CE.
Removed the chip demo for windows CE
Compilation fix for Windows Mobile
Make mkspec/unsupported/linux-host-g++ use correct include
Add "nocopy" mode for seperate-debug-info to configure
Optimized blur / drop shadow effects for the GL 2 paint engine.
Fixed bug in graphics effects caching of graphics item hierarchies.
Added InvalidateReason to invalidateCache to optimize effects
Fixed bug in QGraphicsPixmapItem shortcut for graphics effects.
Optimize QGraphicsItemEffectSourcePrivate::pixmap() for QGraphicsPixmapItems.
Improved raster blur implementation.
Determine QPrinterInfo's supportedPaperSizes on demand.
Added vg to the performance section of the QPainter docs
Stabilize test
Fix warning in public header
OpenVG .def file updates.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -712,6 +712,7 @@ CFG_PTMALLOC=no CFG_STL=auto CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=auto +CFG_SEPARATE_DEBUG_INFO_NOCOPY=no CFG_REDUCE_EXPORTS=auto CFG_MMX=auto CFG_3DNOW=auto @@ -1543,6 +1544,9 @@ while [ "$#" -gt 0 ]; do separate-debug-info) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_SEPARATE_DEBUG_INFO="$VAL" + elif [ "$VAL" = "nocopy" ] ; then + CFG_SEPARATE_DEBUG_INFO="yes" + CFG_SEPARATE_DEBUG_INFO_NOCOPY="yes" else UNKNOWN_OPT=yes fi @@ -6083,6 +6087,9 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then QMakeVar add QMAKE_CXXFLAGS -g QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info" fi +if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then + QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info_nocopy" +fi [ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx" [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" |