summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-1614-141/+227
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix moc generated code with dummy Q_PROPERTY Fix autotest which checks for sample buffers Fix EGL surface leaks when re-parenting QGLWidget on X11/EGL Add autotest for creating a QGLWidget with alpha channel Fix QGLWidgets created with an alpha channel on X11/EGL Add QT_DEBUG_X11_VISUAL_SELECTION to aid debugging X11/EGL Attempt at fixing compilation on Symbian. Got rid of unused variable compiler warning. Fix vertical text centering on Mac OS X Clicking on a selected item wouldn't reset the selection anymore.
| * Fix moc generated code with dummy Q_PROPERTYOlivier Goffart2009-12-162-11/+35
| | | | | | | | | | | | | | | | If there is properties, we cannot skip the code that substract the property number from the id Task-number: QTBUG-5590 Reviewed-by: Brad
| * Fix autotest which checks for sample buffersTom Cooksey2009-12-151-6/+1
| | | | | | | | | | | | | | | | Change c4d66e27 made sample buffers on EGL platforms to default to off, matching desktop GL. This patch fixes the autotest which was still testing for the old behaviour. Reviewed-By: TrustMe
| * Fix EGL surface leaks when re-parenting QGLWidget on X11/EGLTom Cooksey2009-12-154-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | When a QGLWidget is re-parented, it's native X11 window usually gets destroyed and re-created. This also happens when you set a window attribute or flag. On EGL, we must destroy the surface for the window before destroying the window itself, otherwise we can leak the surface. This also fixes lots of BadDrawable errors when running the autotests (which were due to surface leaks!). Reviewed-By: TrustMe
| * Add autotest for creating a QGLWidget with alpha channelTom Cooksey2009-12-151-0/+12
| | | | | | | | Task-number: QT-2602
| * Fix QGLWidgets created with an alpha channel on X11/EGLTom Cooksey2009-12-151-1/+1
| | | | | | | | | | | | | | | | If the QGLWidget's QGLFormat says it should have an alpha channel, try to find an ARGB Visual. Reviewed-By: Trond Task-number: QT-2602
| * Add QT_DEBUG_X11_VISUAL_SELECTION to aid debugging X11/EGLTom Cooksey2009-12-151-15/+31
| |
| * Attempt at fixing compilation on Symbian.Samuel Rødal2009-12-151-88/+83
| | | | | | | | | | | | | | The Symbian compiler seems to have a problem with forward declarations of template functions. Reviewed-by: Bjørn Erik Nilsen
| * Got rid of unused variable compiler warning.Samuel Rødal2009-12-151-2/+0
| |
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-12-1582-913/+2375
| |\
| | * Clicking on a selected item wouldn't reset the selection anymore.Gabriel de Dietrich2009-12-153-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before commit 88ecc8c8250505129ccff2660c60412996e2fd85, this case was handled during the mouse release event, but was responsible for selections being made twice sometimes. We now check whether a selection actually happened during the mouse press event. If not, we will try to select again during the mouse release event. Auto-test included. Reviewed-by: Thierry Task-number: QTBUG-6753
| * | Fix vertical text centering on Mac OS XEskil Abrahamsen Blomfeldt2009-12-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 04d18b38 fixed the windows and ft font engines so that the height reported in QFontMetrics is now correct, but this make vertical text centering one off as the platform defaults is to round down rather than up when the vertical position of the text is in the middle of a pixel. When this was fixed in change 1de8a5b, the vertical centering broke on Mac, since it still reported a too great font height. This patch applies the same hack to the mac font engines to report the correct font height. Task-number: QTBUG-6770 Reviewed-by: joerg
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-1616-66/+160
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix precision loss warning (qreal vs. float on Windows) def file maintenance. def file maintenance. Fixed compile for S60 (.def file updates). QPlainTextEdit scrolling issue with folded paragraphs Designer: Show actions in action editor in QKeySequence::NativeText Fix up documentation examples for low-level audio. Add -audio-backend and -no-audio-backend configure option. audioinput and audiooutput examples not using isFormatSupported Qt fails to build on RHEL 4 and other older Linux versions because of
| * \ \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-15181-1780/+4903
| |\ \ \
| | * | | Fix precision loss warning (qreal vs. float on Windows)Alessandro Portale2009-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen modified: tools/linguist/linguist/messageeditor.h
| | * | | def file maintenance.Rohan McGovern2009-12-151-5/+5
| | | | |
| | * | | def file maintenance.Rohan McGovern2009-12-151-1/+1
| | | | |
| | * | | Fixed compile for S60 (.def file updates).Rohan McGovern2009-12-151-45/+47
| | | | | | | | | | | | | | | | | | | | | | | | | More private API changes, and mark QEgl symbols as ABSENT so compilation is not broken when OpenVG is disabled.
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-12-1477-824/+2000
| | |\ \ \
| | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-1410-10/+98
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | | * | | | Fix up documentation examples for low-level audio.Kurt Korbatits2009-12-092-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-6548 QAudioOutput::start() crashes when the QIODevice is destructed Made documentation clearer. Task-number:QTBUG-6548 Reviewed-by:Justin McPherson
| | | * | | | Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-095-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
| | | * | | | audioinput and audiooutput examples not using isFormatSupportedKurt Korbatits2009-12-072-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function. The examples failed to easy, added check to test and get if required a format to use from the backend. Increases the chance of examples working on various platforms like n900. Reviewed-by:Justin McPherson
| | | * | | | Qt fails to build on RHEL 4 and other older Linux versions because ofKurt Korbatits2009-12-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old ALSA Added alsa version checking in config test, must have >= 1.0.10 to enable. Task-number:QTBUG-6493 Reviewed-by:Justin McPherson
| * | | | | | QPlainTextEdit scrolling issue with folded paragraphsmae2009-12-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Qt Creator, we could reproduce scrolling problems when paragraphs were folded away. Effectively the first "visible" block could be an invisible one, resulting in firstVisibleBlock() returning something bogus. The result were drawing errors. Reviewed-by: con
| * | | | | | Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format as in Property editor and elsewhere for consistence. Task-number: QTBUG-6760
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-1535-801/+1450
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Add an image allocation pool to the OpenVG paint engineRhys Weatherley2009-12-158-53/+479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some OpenVG GPU's have limitations on the amount of memory available to create VGImage's. When the memory runs out, vgCreateImage() will fail. This change introduces QVGImagePool, which keeps track of all QVGPixmapData image allocations and ejects least-recently-used pixmaps when GPU memory is exhausted. Task-number: QT-2554 Reviewed-by: trustme
| * | | | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-1447-110/+941
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-1475-822/+1953
| | |\ \ \ \ \
| | * | | | | | OpenVG .def file updates.Rohan McGovern2009-12-142-2/+47
| | | |_|/ / / | | |/| | | |
| * | | | | | Fix QMetaObject::connect and disconnect with "dynamic signals"Olivier Goffart2009-12-143-20/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML might pass index that are larger that the method cound. We must not call QMetaObjectPrivate::originalClone in that case as this would read invalid memory Reviewed-by: brad
| * | | | | | Test fixed for Windows CE.ninerider2009-12-141-13/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some test very corrected, the low level file descriptor tests mostly skipped as well as the multiple memory mapping of a file, which resulted in the file handle not beeign properly released. Reviewed-by: thartman
| * | | | | | Removed the chip demo for windows CEninerider2009-12-141-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chip demo causes a memory exception on most Windows CE devices. For now we simply will not include this demo in the package for Windows CE. In the future a specialized version might be created. Reviewed-by: Maurice
| * | | | | | Compilation fix for Windows Mobileninerider2009-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default style (plastique) used was not available if not included in the build. Using now the windows style instead. Reviewed-by: Maurice
| * | | | | | Make mkspec/unsupported/linux-host-g++ use correct includeTom Cooksey2009-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trustme
| * | | | | | Add "nocopy" mode for seperate-debug-info to configureTom Cooksey2009-12-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was written by Harald Fernengel for Maemo5 port. This effectively just adds -g to QMAKE_CFLAGS & QMAKE_CXXFLAGS and is mainly for packagers who want to build Qt in release mode and still have debug symbols, but will want to strip those debug symbols out themselves (rather than let Qt do it). Reviewed-By: Harald Fernengel Reviewed-By: Thiago Macieira
| * | | | | | Optimized blur / drop shadow effects for the GL 2 paint engine.Samuel Rødal2009-12-148-614/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do the blur in half the resolution in software and then upload the result as a texture and smooth-scale it on the GPU. This leads to stable and decent performance regardless of the blur radius, and simplifies the implementation quite a bit. Reviewed-by: Bjørn Erik Nilsen
| * | | | | | Fixed bug in graphics effects caching of graphics item hierarchies.Samuel Rødal2009-12-141-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to invalidate the cache if the transform of a sub-item changes. Reviewed-by: Bjørn Erik Nilsen
| * | | | | | Added InvalidateReason to invalidateCache to optimize effectsSamuel Rødal2009-12-143-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us ignore the invalidateCache call when the transform of a graphics item with an effect changes, and the cached system is LogicalCoordinates and cached mode is not PadToEffectiveBoundingRect. Reviewed-by: Bjørn Erik Nilsen
| * | | | | | Fixed bug in QGraphicsPixmapItem shortcut for graphics effects.Samuel Rødal2009-12-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to take the pixmap item's drawing offset into consideration. Reviewed-by: Bjørn Erik Nilsen
| * | | | | | Optimize QGraphicsItemEffectSourcePrivate::pixmap() for QGraphicsPixmapItems.Samuel Rødal2009-12-142-7/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even for DeviceCoordinate mode we can return the raw pixmap if the graphics item size is untransformed. Reviewed-by: Bjørn Erik Nilsen
| * | | | | | Improved raster blur implementation.Samuel Rødal2009-12-141-59/+299
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use more bits of precision in the fixed point exponential blur algorithm, which allows more fine-grained radii which is required for animating the blur. Also optimize the implementation a bit by transposing the image instead of blurring vertically which isn't very cache-efficient. Reviewed-by: Bjørn Erik Nilsen
| * | | | | Determine QPrinterInfo's supportedPaperSizes on demand.David Faure2009-12-141-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The paper size determination requires a cupsGetPPD(), which can be a slow HTTP download. So doing it on demand makes QPrinterInfo::defaultPrinter() much faster, because it doesn't actually need the paper sizes at all. Before this fix, it was requesting the PPD file of every known CUPS printer, every time it was called. My battery of unittests for code that uses QPrinter went from 19 minutes when the cups print server is switched off, to 13 seconds! This fix also removes some code duplication, which is always nice. Task-number: 232664, QTBUG-3033 Reviewed-by: Trond
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-143-4/+5
| |\ \ \ \ \
| | * | | | | Stabilize testOlivier Goffart2009-12-142-2/+3
| | | | | | |
| | * | | | | Fix warning in public headerOlivier Goffart2009-12-141-2/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qcache.h:73: warning: declaration of 'object' shadows a member of this Spotted by compilerwarnings autotest Reviewed-by: Thiago
| * | | | | Added vg to the performance section of the QPainter docsGunnar Sletta2009-12-141-0/+6
| |/ / / /
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-141-6/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed spelling in docs
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-1417-14/+1065
| |\ \ \ \