summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | Doc: fix typoVolker Hilsheimer2009-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-6539
| | | | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-12-170-0/+0
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/kernel/kernel.pri
| | | | | * | fix Cocoa buildPeter Hartmann2009-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with change 83940f25, we used LIBS_PRIVATE on the Mac; somewhere the line where we linked against the Mac libs in the network kernel was lost. Reviewed-By: Thiago
| | * | | | | doc: Fixed typos.Martin Smith2009-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6898
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-195-61/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing compile issue on Windows CE Fixed two incorrect signal connections. Switched two files to BSD license.
| * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-185-61/+55
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing compile issue on Windows CE Fixed two incorrect signal connections. Switched two files to BSD license.
| | * | | | | | Fixing compile issue on Windows CEAleksandar Sasha Babic2009-12-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | | Fixed two incorrect signal connections.axis2009-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Friedemann Kleint
| | * | | | | | Switched two files to BSD license.axis2009-12-182-56/+52
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because they become a static library that is linked into every application. RevBy: Espen Riskedal
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-1925-91/+928
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QPixmap::load() to not modify referenced copies. Fixes bug when using AnchorUnderMouse for GraphicsView transformation. Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source. Make sure mappings are created for columns when indexes newly become parents. NEON configure detection and initial blend function implementations. Optimize QThreadStorage with QVector Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-1825-91/+928
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QPixmap::load() to not modify referenced copies. Fixes bug when using AnchorUnderMouse for GraphicsView transformation. Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source. Make sure mappings are created for columns when indexes newly become parents. NEON configure detection and initial blend function implementations. Optimize QThreadStorage with QVector Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.
| * | | | | | Fixed QPixmap::load() to not modify referenced copies.Trond Kjernåsen2009-12-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bad regression from 4.5. QPixmap::load() would modify all references to the same QPixmap object. Task-number: QTBUG-6840 Reviewed-by: Kim
| * | | | | | Fixes bug when using AnchorUnderMouse for GraphicsView transformation.Yoann Lopes2009-12-182-3/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now automatically enable mouse tracking on the viewport of the GraphicsView when setting AnchorUnderMouse as transformationAnchor or resizeAnchor. Autotest included. Task-number: QTBUG-6835 Reviewed-by: bnilsen
| * | | | | | Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel ↵Stephen Kelly2009-12-182-13/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match its source. Merge-request: 2266 Reviewed-by: Olivier Goffart
| * | | | | | Make sure mappings are created for columns when indexes newly become parents.Stephen Kelly2009-12-188-17/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move the modeltest related tests to the modeltest subdirectory Merge-request: 2262 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | | | | NEON configure detection and initial blend function implementations.Samuel Rødal2009-12-188-4/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new NEON configure test and -no-neon configure option. NEON implementations can also be turned off by setting the QT_NO_NEON environment variable. Performance improvements (in frames per second): - Blending ARGB32 on RGB32/ARGB32, mostly opaque: 71 % - Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 108 % - Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 158 % - Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 189 % Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta Reviewed-by: Paul Olav Tvete
| * | | | | | Optimize QThreadStorage with QVectorOlivier Goffart2009-12-185-49/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThreadStorageData::get might be accessed very often. QMap lookup has proven to be too slow. We can expect about 20 instances of QThreadStorage in a typical applications (tested with some KDE applications) So a QVector is more suited Note: we now re-use the ids. Which means that if the QThreadStorage is destroyed before the QThread, and another one is created, we might get crashes (instead of a warning printed to the console) Reviewed-by: brad
| * | | | | | Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.Olivier Goffart2009-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2009-12-184-14/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Check if the scene exists before attempting to set its focus item. The "audioinput" multimedia example locks up the audio input/output no audiodevices found using QAudioDeviceInfo::availableDevices on Ubuntu
| * | | | | | Check if the scene exists before attempting to set its focus item.Michael Brasser2009-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents crashing when an item involved in the scope chain is set to be visible but it isn't part of a scene. Reviewed-by: Alexis Menard
| * | | | | | The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-182-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-5633 Reviewed-by:Justin McPherson
| * | | | | | no audiodevices found using QAudioDeviceInfo::availableDevices on UbuntuKurt Korbatits2009-12-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-6866 Reviewed-by:Justin McPherson
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-187-66/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent access to non-existent memory in triagulating stroker Align GL_RGB lines on a 4-byte boundary when uploading pixmap textures Cleanup qsqldatabase test case a little bit. GL2Engine: Don't mark brush as dirty if it hasn't changed Doc: setFeature snippet was in the wrong place
| * | | | | | | Prevent access to non-existent memory in triagulating strokerRhys Weatherley2009-12-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the triangulating stroker, the last point was being duplicated in dashed paths. But because QDataBuffer::add() takes a ref to a float rather than a float, it would resize the data buffer and then try to fetch the values out of a pointer to the original buffer memory. This change copies the values into temporary variables before resizing the array. Task-number: QTBUG-6045 Reviewed-by: Sarah Smith
| * | | | | | | Align GL_RGB lines on a 4-byte boundary when uploading pixmap texturesRhys Weatherley2009-12-181-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code was aligning lines on a 3-byte boundary. Task-number: QTBUG-6902 Reviewed-by: Julian de Bhal
| * | | | | | | Cleanup qsqldatabase test case a little bit.Bill King2009-12-171-15/+9
| | | | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-174-36/+43
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: GL2Engine: Don't mark brush as dirty if it hasn't changed Doc: setFeature snippet was in the wrong place
| | * | | | | | GL2Engine: Don't mark brush as dirty if it hasn't changedTom Cooksey2009-12-173-34/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same brush is used over and over again, this gives a huge performance boost (measured to be 25% faster on desktop and 73% faster on SGX). Reviewed-By: Samuel Rødal
| | * | | | | | Doc: setFeature snippet was in the wrong placeJoerg Bornemann2009-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Niels Weber
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-183-12/+43
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compilation with -static on Mac OS X Configure support for multiple include levels in qmake.conf hierarchy. Stop the configuration if the test compiler cannot be found.
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-173-12/+43
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compilation with -static on Mac OS X Configure support for multiple include levels in qmake.conf hierarchy. Stop the configuration if the test compiler cannot be found.
| | * | | | | | Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid linking the solutions used by Designer twice (in the two Designer libraries). Just use the include paths in case of static linking. Reviewed-by: Carlos Duclos <carlos.duclos@nokia.com> Task-number: QTBUG-6863
| | * | | | | | Configure support for multiple include levels in qmake.conf hierarchy.Harald Fernengel2009-12-171-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a configuration file included in qmake.conf had an include statements of its own, the variables defined in the second level of included files were not parsed by getQMakeConf function from configure. Author: Adrian Constantin <adrian.constantin@nokia.com> Reviewed-by: Thiago Macieira
| | * | | | | | Stop the configuration if the test compiler cannot be found.Harald Fernengel2009-12-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Adrian Constantin <adrian.constantin@nokia.com> Reviewed-by: Thiago Macieira
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-172-4/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: WeatherInfo now shows Oslo info upon launch instead of blank screen Fixed QCoeFepInputContext::widgetDestroyed
| * | | | | | | WeatherInfo now shows Oslo info upon launch instead of blank screenMiikka Heikkinen2009-12-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6367 Reviewed-by: Janne Anttila
| * | | | | | | Fixed QCoeFepInputContext::widgetDestroyedMiikka Heikkinen2009-12-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling SetFocus twice here was obsolete and caused intermittent panics. Replaced them with proper queueInputCapabilitiesChanged call. Task-number: QTBUG-6519 Reviewed-by: axis
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-172-12/+62
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added discussion on connecting signals that have default arg values. Stack overflow when closing a Color panel in Cocoa.
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-1731-346/+253
| |\ \ \ \ \ \ \
| | * | | | | | | Stack overflow when closing a Color panel in Cocoa.Prasanth Ullattil2009-12-171-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QCocoaColorPanelDelegate was going into an infinite recrusion in this particular case. The patch guards the delegate from calling accept() or reject() more than once. Task-number: QTBUG-6636 Reviewed-by: Richard Moe Gustavsen
| * | | | | | | | doc: Added discussion on connecting signals that have default arg values.Martin Smith2009-12-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3913
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-171-4/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed parsing of svg paths.
| * | | | | | | | Fixed parsing of svg paths.Kim Motoyoshi Kalland2009-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 928ee705 introduced a bug which affected paths with relative offsets. Task-number: QTBUG-6867 Reviewed-by: Trond
* | | | | | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-1743-200/+407
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Avoid timer starvation when handling many X11 eventsBradley T. Hughes2009-12-173-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57, timers are normally run at idle priority. This makes it possible for the X11 handler to starve timers indefinitely. Fix this by enforcing one normal priority pass of the timer source after we have processed all X11 events. This has the added benefit of keeping animation timers smooth and consistent, which is the intention of this change. Reviewed-by: Jens Bache-Wiig
| * | | | | | | Disable benchlibwalltime test.Rohan McGovern2009-12-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is inherently dependent on the timing behavior of the test machine. For now, it seems too difficult to ensure this works everywhere.
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-1616-196/+52
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed wheel event delivery in graphicsview.Denis Dzyubenko2009-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to flip the y-coordinate of window- and view-local coordinates because they are flipped already. Reviewed-by: Prasanth
| | * | | | | | | An optimisation to QTextStreamDenis Dzyubenko2009-12-161-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QLocale::operator== is faster than comparing languages, because when getting a language from a default constructed QLocale object, it initializes the system locale and quieries the system which languge it supports. Reviewed-by: Olivier Goffart
| | * | | | | | | Doc fix: mark QFileOpenEvent::url to be available since 4.6Denis Dzyubenko2009-12-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2025-01-13 00:47:42 (GMT)