summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-191-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add Qt5 comment
| * Add Qt5 commentOlivier Goffart2010-05-191-1/+1
| | | | | | | | Task-number: QTBUG-10807
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-1813-127/+371
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Minor improvement to QObject constructor performance Test hasGuard before calling clearGuards. Do not clear lists in ~QObject QObjectPrivate::deleteWatch, and inEventHandler are only used by jambi Only emit the destroyed() signal if connected Benchmark for QMutex. Inline the common case when there is no contention. Optimize ~QList
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-1813-127/+371
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Minor improvement to QObject constructor performance Test hasGuard before calling clearGuards. Do not clear lists in ~QObject QObjectPrivate::deleteWatch, and inEventHandler are only used by jambi Only emit the destroyed() signal if connected Benchmark for QMutex. Inline the common case when there is no contention. Optimize ~QList
| * Minor improvement to QObject constructor performanceAaron Kennedy2010-05-181-23/+29
| | | | | | | | Reviewed-by: Olivier Goffart
| * Test hasGuard before calling clearGuards.Olivier Goffart2010-05-182-7/+3
| | | | | | | | | | | | So no need to test it inside clearGuards. Reviewed-by: Brad
| * Do not clear lists in ~QObjectOlivier Goffart2010-05-181-6/+0
| | | | | | | | | | | | The list are going to be destroyed anyway Reviewed-by: Brad
| * QObjectPrivate::deleteWatch, and inEventHandler are only used by jambiOlivier Goffart2010-05-183-6/+17
| | | | | | | | | | | | so #ifdef them out. Reviewed-by: Brad
| * Only emit the destroyed() signal if connectedOlivier Goffart2010-05-181-15/+9
| | | | | | | | | | | | Also remove dead code in the exception code Reviewed-by: Brad
| * Benchmark for QMutex.Olivier Goffart2010-05-182-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently only cover the case when there is no contention $ ./tst_bench_qmutex noThread -callgrind ********* Start testing of tst_QMutex ********* Config: Using QTest library 4.7.0, Qt 4.7.0 PASS : tst_QMutex::initTestCase() RESULT : tst_QMutex::noThread():"noLock": 60,000,054 instruction reads per iteration (total: 60,000,054, iterations: 1) RESULT : tst_QMutex::noThread():"QMutexInline": 240,000,057 instruction reads per iteration (total: 240,000,057, iterations: 1) RESULT : tst_QMutex::noThread():"QMutex": 380,000,056 instruction reads per iteration (total: 380,000,056, iterations: 1) RESULT : tst_QMutex::noThread():"QMutexLocker": 240,000,058 instruction reads per iteration (total: 240,000,058, iterations: 1) PASS : tst_QMutex::noThread() PASS : tst_QMutex::cleanupTestCase() Totals: 3 passed, 0 failed, 0 skipped ********* Finished testing of tst_QMutex ********* $ make && ./tst_bench_qmutex noThread ********* Start testing of tst_QMutex ********* Config: Using QTest library 4.7.0, Qt 4.7.0 PASS : tst_QMutex::initTestCase() RESULT : tst_QMutex::noThread():"noLock": 27 msecs per iteration (total: 27, iterations: 1) RESULT : tst_QMutex::noThread():"QMutexInline": 212 msecs per iteration (total: 212, iterations: 1) RESULT : tst_QMutex::noThread():"QMutex": 257 msecs per iteration (total: 257, iterations: 1) RESULT : tst_QMutex::noThread():"QMutexLocker": 212 msecs per iteration (total: 212, iterations: 1) PASS : tst_QMutex::noThread() PASS : tst_QMutex::cleanupTestCase() Totals: 3 passed, 0 failed, 0 skipped ********* Finished testing of tst_QMutex *********
| * Inline the common case when there is no contention.Olivier Goffart2010-05-187-67/+174
| | | | | | | | | | | | | | | | | | | | | | | | QMutex locking could be used in performence critical code (such as QObject and co.) where the cost of a function call is not neglectible. This would slow down the common case where there is only one thread and no contention. Since we need to keep the old symbol for binary compatibilty, introduce new *Inline function. Reviewed-by: Brad
| * Optimize ~QListOlivier Goffart2010-05-181-3/+2
| | | | | | | | | | | | | | | | | | There is no need to check for d as it must never be 0 And the refcount ins QList::free() is nessecerly 0 since it is checked before the function is called Reviewed-by: ossi
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-185-34/+4
|\ \ | |/ |/| | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove QT_NO_THREAD support for QHostInfo
| * Remove QT_NO_THREAD support for QHostInfoMarkus Goetz2010-05-185-34/+4
| | | | | | | | Reviewed-by: Thiago
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-171-92/+103
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Fix use of uninitialized address bar.
| * Assistant: Fix use of uninitialized address bar.ck2010-05-171-92/+103
| | | | | | | | Also bail out when we can't set up the help engine.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-147-21/+95
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Enable switching between pages via an in-page combo box.
| * Assistant: Enable switching between pages via an in-page combo box.ck2010-05-147-21/+95
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-125-46/+142
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a coding style issue in a generated code in the QScriptValue tests. Fix Mac-specific tests about the hidden QScriptValue autotest generator modification. Fix the hidden status check for a file on Fix for root path issue in tst_qdir. (case "drive:") Fix tst_qdir to use const char* instead of QString for QTest::newRow Fix for qfsfileengine_win to return proper absolute path for C:\
| * Fix a coding style issue in a generated code in the QScriptValue tests.Jedrzej Nowacki2010-05-121-34/+48
| | | | | | | | | | | | | | | | Fix the generator, few redundant commas and spaces where removed from generated code. The autotest suite wasn't regenerated. Reviewed-by: Kent Hansen
| * Fix Mac-specific tests about the hiddenFabien Freling2010-05-121-2/+24
| | | | | | | | | | | | attribute. Create a new test only for Mac.
| * QScriptValue autotest generator modification.Jedrzej Nowacki2010-05-121-16/+25
| | | | | | | | | | | | | | Generator shouldn't leave whitespace at the end of line in the generated code. Reviewed-by: Kent Hansen
| * Fix the hidden status check for a file onFabien Freling2010-05-112-0/+8
| | | | | | | | | | | | | | | | | | | | Mac OS X. Add some more tests that would have failed before the fix. Remove test files after the run. Task-number: QTBUG-6619 Reviewed-by: Morten Sorvig
| * Fix for root path issue in tst_qdir. (case "drive:")Zeno Albisser2010-05-101-1/+1
| | | | | | | | | | | | | | | | Windows only: Since the working directory is not necessarily located on the root drive, we should not rely on rootPath for the test. Reviewed-by: TrustMe
| * Fix tst_qdir to use const char* instead of QString for QTest::newRowZeno Albisser2010-05-101-4/+4
| | | | | | | | | | | | This is only needed to compile on msvc2005 Reviewed-by: TrustMe
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-072-4/+47
| |\ |/ / | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix for qfsfileengine_win to return proper absolute path for C:\
| * Fix for qfsfileengine_win to return proper absolute path for C:\Zeno Albisser2010-05-072-4/+47
| | | | | | | | | | | | | | | | | | | | When using canonicalPath on a QDir that currently just represents a root directory, a valid path name such as "C:\" should be returned. Previously we returned "C:" which in fact would point to the current working directory on drive C: and therefor is not necessarily the same. Reviewed-by: Thiago Task-number: QTBUG-6680
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-073-68/+186
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation of the tst_qmetaobject test QObject: Optimize BlockingQueuedConnection connections QMetaObject::invokeMethod using Qt::BlockingQueuedConnection can handle the return value.
| * | Fix compilation of the tst_qmetaobject testOlivier Goffart2010-05-071-1/+1
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-073-68/+186
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QObject: Optimize BlockingQueuedConnection connections QMetaObject::invokeMethod using Qt::BlockingQueuedConnection can handle the return value.
| * | QObject: Optimize BlockingQueuedConnection connectionsOlivier Goffart2010-05-071-30/+23
| | | | | | | | | | | | | | | | | | | | | We do not need to copy the argument as we do for QueuedConnection Same logic as the previous change. Reviewed-by: Brad
| * | QMetaObject::invokeMethod using Qt::BlockingQueuedConnection can handle the ↵Olivier Goffart2010-05-073-38/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return value. When using Qt::BlockingQueuedConnection, we do not need to copy the arguments, and we can handle the return type. The argv we pass to the event is the param vector alocated on the stack. Since we don't need to destroy the argument, we can pass 0 for the types. The private QMetaCallEvent destructor is modified not to destroy the arguments if types_ is 0 Task-number: QTBUG-10440 Reviewed-by: Brad
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-071-3/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix tst_qaccessibility::accelerators on Mac
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-061-3/+4
| |\ \ |/ / / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix tst_qaccessibility::accelerators on Mac
| * | Fix tst_qaccessibility::accelerators on MacMorten Johan Sørvig2010-05-061-3/+4
| | | | | | | | | | | | | | | | | | QAccessibleInterface::text(QAccessibile::Accelerator) returns the Mac symbol for the key known as ALT on other platforms, so we must use QKeySequence::NativeText when verifying.
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-05-05188-2280/+6984
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (49 commits) Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2 Fixed a QBuffer warning caused by a regression in qjpeg QGraphicsView drawing artifacts due to rounding errors. Fixed OpenGL version flags for versions > 3.2. Do not link QtGui in benchmarks which don't need it Fix a small typo: therfore -> therefore Fix a small typo in setColor description (brush -> color) only add phonon and scripttools dependencies if they're available, otherwise linking will fail s/INCPATH/INCLUDEPATH/ qdoc: Added breadcrumbs for most other pages. Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""" Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11 Fix bold text rendering of Thai and Vietnamese on Symbian Event dispatcher slow down using delays rather than thread priority Fix project file generation for MSVC 2010 Fixed incorrect runtime platform version check in Phonon MMF backend Fix wrong translation and clip for the raster paint-engine on Mac Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774 Removing unused code. Return the correct library name in qt_gl_library_name for GLES* ...
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-05-04188-2280/+6984
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2 Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2 Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
| | | | * | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | * Integrated http://trac.webkit.org/changeset/58673 -- Fix qtlibraryinfix not to contain space
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
| | | | | * | Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes integrated: || <https://webkit.org/b/33875> || [Qt] QWebPage::userAgentForUrl is terrible API || || <https://webkit.org/b/38371> || [Qt] GraphicsLayer: animation incorrect when scrolling || || <https://webkit.org/b/32196> || Make it possible to distinguish between NPAPI plugins and Application plugins || || <https://webkit.org/b/37207> || [Qt] QtWebKit 2.0 library version needs to be maintained in WebCore.pro ||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-0359-367/+1959
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (25 commits) Fixed a QBuffer warning caused by a regression in qjpeg QGraphicsView drawing artifacts due to rounding errors. Fixed OpenGL version flags for versions > 3.2. Do not link QtGui in benchmarks which don't need it Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""" Fix project file generation for MSVC 2010 Fix wrong translation and clip for the raster paint-engine on Mac Return the correct library name in qt_gl_library_name for GLES* qmake: remove useless evaluation of variables from VS project generators Fix QT_NO_LIBRARY Documentation for the Elastic Nodes example. qmake: fix duplicate linker options in VS project files Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent. qmake: fix duplicate compiler options in VS project files Documentation for the Drag and Drop Robot example. Fix crash in styles example when running with opengl graphicssystem Fixed the sizehint for cols/rows in qtableview QUrl: parsing of host name with an undercore. Null pointer check Revert "Try to use multisampled opengl graphicssystem on all platforms" ...
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-0312-89/+215
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-0358-364/+1950
| | | | |\ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits) QGraphicsView drawing artifacts due to rounding errors. Fixed OpenGL version flags for versions > 3.2. Do not link QtGui in benchmarks which don't need it Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""" Fix project file generation for MSVC 2010 Fix wrong translation and clip for the raster paint-engine on Mac Return the correct library name in qt_gl_library_name for GLES* qmake: remove useless evaluation of variables from VS project generators Fix QT_NO_LIBRARY Documentation for the Elastic Nodes example. qmake: fix duplicate linker options in VS project files Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent. qmake: fix duplicate compiler options in VS project files Documentation for the Drag and Drop Robot example. Fix crash in styles example when running with opengl graphicssystem Fixed the sizehint for cols/rows in qtableview QUrl: parsing of host name with an undercore. Null pointer check Revert "Try to use multisampled opengl graphicssystem on all platforms" A small mistake when comparing the flag. ...
| | | | * | | | QGraphicsView drawing artifacts due to rounding errors.Bjørn Erik Nilsen2010-05-036-80/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found during investigation of QTBUG-8820, and clearly visible in examples/graphicsview/diagramscene when slowly moving an item out of the viewport (left and top edge). Caused by two problems: 1) Using QRectF::toRect() instead of QRectF::toAlignedRect(). 2) Didn't adjust the item's bounding rect properly in drawSubtree(). QRectF::toRect() is completely useless since all the coordinates are rounded to the nearest integer. E.g. QRectF(-0.4, -0.4, 10.4, 10.4).toRect() -> QRect(0, 0, 10, 10), whereas toAlignedRect() returns QRect(-1, -1, 11, 11). Then when we have a proper aligned rect, we have to adjust it by 2 pixels in all directions (or 1 pixel in case of QGraphicsView::DontAdjustForAntialiasing). At first glance this adjustment seems too much, since one would assume adjusing the QRectF by 0.5 before using toAlignedRect() would be sufficient. That's sufficient in an untransformed world with pens using BevelJoin. However, the story is completely different as soon as the world is transformed or the pens use a different join. It's basically complicated (in some cases impossible) to calculate a pixel perfect aligned QRect, so instead we adjust by the amount of pixels required in the worst case. This commit also includes some optimizations for QRegion updates (since I anyways had to change the code). There's no point in using QRegion granularity if the viewport update mode is either FullViewportUpdate or BoundingRectViewportUpdate. Auto tests adjusted and new ones included. Task-number: QTBUG-10338
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-036-9/+21
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a small typo: therfore -> therefore Fix a small typo in setColor description (brush -> color) only add phonon and scripttools dependencies if they're available, otherwise linking will fail s/INCPATH/INCLUDEPATH/ qdoc: Added breadcrumbs for most other pages.
| | | * | | | | Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| | | | | | | |
| | | * | | | | Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
| | | | | | | |
| | | * | | | | only add phonon and scripttools dependencies if they're available, otherwise ↵Romain Pokrzywka2010-05-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linking will fail Merge-request: 591 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2025-09-07 00:48:41 (GMT)