summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2716-97/+389
|\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't run the QGL test on systems that does not have GL support. Remove an useless assert from comp_func_SourceOver_sse2() QScriptEngineAgent: recompile all the function when installing a debugger. QScriptDeclarativeObject: we need to save the current stack pointer. QScriptValue::objectId(): do not assert if the value is not a cell Implement the composition mode "Plus" with SSE2 Clean the CompositionFunction tables of drawhelper
| * Don't run the QGL test on systems that does not have GL support.Trond Kjernåsen2010-07-271-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | On a Mac that has no screens connected, it is possible to create offscreen GL contexts, but not normal QGLWidgets. There are some assumptions both in the tests and in the QGL module that this if you can create one of them, you can create both. The test now check if it can create a valid QGLWidget, if it can't it will skip running all the QGL tests. Task-number: QTBUG-12138 Reviewed-by: Prasanth
| * Remove an useless assert from comp_func_SourceOver_sse2()Benjamin Poulain2010-07-271-1/+0
| | | | | | | | | | | | | | The assert can never be true since const_alpha is unsigned. That line was triggering a warning on GCC. Reviewed-by: Olivier Goffart
| * QScriptEngineAgent: recompile all the function when installing a debugger.Olivier Goffart2010-07-274-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Recompile all the function is necessary to ger the debug opcode that notifies us when the position changes. The change in CollectorHeapIterator.h is nessesary to get it work as Debugger::recompileAllJSFunctions uses LiveObjectIterator, LiveObjectIterator initialied m_cell to -1 and to ++(*this) in its constructor. But as m_cell is of type size_t (unsigned) then the < comparison will always fail as it is an unsigned comparison. This was already fixed upstream in r54672 Reviewed-by: Jedrzej Nowacki
| * QScriptDeclarativeObject: we need to save the current stack pointer.Olivier Goffart2010-07-271-2/+2
| | | | | | | | | | | | | | in DeclarativeObjectDelegate::put, else we cannot get a proper backtrace in the debugger. Reviewed-by: Kent Hansen
| * QScriptValue::objectId(): do not assert if the value is not a cellOlivier Goffart2010-07-271-1/+1
| | | | | | | | | | | | JSC::JSValue::asCell asserts if it is not a cell Reviewed-by: Jedrzej Nowacki
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-279-86/+302
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Implement the composition mode "Plus" with SSE2 Clean the CompositionFunction tables of drawhelper
| | * Implement the composition mode "Plus" with SSE2Benjamin Poulain2010-07-274-9/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the composition function for CompositionMode_Plus with SSE2. The macro MIX() can be replaced by a single instruction add-saturate, which increase the speed a lot (13 times faster on the blend benchmark). Reviewed-by: Olivier Goffart Reviewed-by: Andreas Kling
| | * Clean the CompositionFunction tables of drawhelperBenjamin Poulain2010-07-277-77/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some instructions sets were defining partial table of composition functions. To work around that, qInitDrawhelperAsm() was resetting the composition function of QPainter::CompositionMode_Destination and anything above QPainter::CompositionMode_Xor. This was a problem because it makes it impossible to implement fast path for those composition mode. This patch export prototypes for the generic functions of each composition mode. The specialized implementations now define a complete table. Reviewed-by: Andreas Kling
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-277-14/+42
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix signal emission of QDesktopWidget on Symbian. Fixed gcce linker error when linking against s60main built by armcc. Fixed plugin build key for Symbian builds under Linux. Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| * | Fix signal emission of QDesktopWidget on Symbian.Jason Barron2010-07-271-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopWidget on Symbian was not properly emitting the resized() and the workAreaResized() signals. Qt was properly translating the system event and sending the QResizeEvent to the widget, but the signal emission is determined solely based on changes in the QVectors of QRects outlining the screen dimensions. On Symbian, these vectors were never being set and as a result the signals were never omitted. The fix is to set the rects correctly in the init() function which is called by the resizeEvent() handler. Also modify the accessor functions to return the rectangles stored in the vector instead of querying for them each time. Task-number: QTBUG-11433 Reviewed-by: axis Autotest: PASSES
| * | Fixed gcce linker error when linking against s60main built by armcc.axis2010-07-271-0/+1
| | | | | | | | | | | | | | | Task: QTBUG-10680 RevBy: Trust me
| * | Fixed plugin build key for Symbian builds under Linux.axis2010-07-271-1/+11
| | | | | | | | | | | | | | | Task: QTBUG-8962 RevBy: Jason Barron
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-274-7/+14
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-264-7/+14
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-264-7/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| | | * Fixed package creation when shadow building.axis2010-07-262-4/+7
| | | | | | | | | | | | | | | | RevBy: Markus Goetz
| | | * Fix crash caused by not clearing the QPixmapCache on application exit.Oleh Vasyura2010-07-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qt_cleanup() function will call CCoeEnv::DestroyEnvironment() on application shutdown. This destruction will in turn tear down the various server sessions associated with the application. One of these sessions is the FBSERV session and if the QPixmapCache attempts to delete a CFbsBitmap after the session has been destroyed, the app will crash. The solution is call QPixmapCache::cleanup() before we destroy the environment. This is inline with what the other platforms do. Reviewed-by: Jason Barron
| | | * Removed QEXPECT_FAIL macros from test cases which now passGareth Stockwell2010-07-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10643 Task-number: QTBUG-11376 Reviewed-by: Jason Barron
| | | * Ensure backing store is deleted before top-level windowGareth Stockwell2010-07-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this is not done, later deletion of the backing store may cause a crash. If the backing store is an EGL surface, its destruction includes a call to eglDestroySurface(), which triggers an exception if the window handle passed as a parameter is no longer valid. Task-number: QTBUG-10643 Task-number: QTBUG-11376 Reviewed-by: Jason Barron
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2710-16/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Document that animations have to be started/stopped as a group various doc fixes Document 'this' as undefined in QML
| * | | | Document that animations have to be started/stopped as a groupBea Lam2010-07-271-0/+8
| | | | |
| * | | | various doc fixesBea Lam2010-07-278-16/+14
| | | | |
| * | | | Document 'this' as undefined in QMLMartin Jones2010-07-271-0/+25
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-12396 Reviewed-by: Aaron Kennedy
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-271-3/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update changelog for 4.7.0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-261-3/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update changelog for 4.7.0
| | * | | update changelog for 4.7.0Peter Hartmann2010-07-261-3/+7
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-2613-12/+182
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590
| * | | | Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-07-2613-12/+182
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/42474> || Spatial navigation: do not consider outline for focusable element boundaries || || <https://webkit.org/b/41484> || [Qt] Clamp color stops passed to QGradient to 1.0 || || <https://webkit.org/b/29381> || [Qt] [Regression] QWebView::setHtml() executes script body twice || || <https://webkit.org/b/30879> || Loading HTML with a JS alert() when the DocumentLoader has been set to not defer data load results in ASSERT ||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2634-56/+588
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Do check after all if we have partialUpdateSupport. QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties. Doc: use const& in foreach when applicable. QGLBuffer::bind()/release() should not be const functions. Use SSSE3 to convert from RGB888 to RGB32 Extend the build system to SSSE3 CPU feature detection for x86_64 Use the appropriate CPUID bitmap for detecting SSE3 etc Skip tst_QLineEdit::QTBUG697_paletteCurrentColorGroup on non-x11 Stabilize tst_qlineedit.cpp QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow Fix QLineEdit's Highlight color when inactive.
| * | | Do check after all if we have partialUpdateSupport.Michael Dominic K2010-07-261-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12266 Merge-request: 752 Reviewed-by: Trond
| * | | QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties.Olivier Goffart2010-07-261-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativePropertyPrivate::setBinding would delete the binding if it cannot set the property. Then the call to binding->update() would crash. So test for (property.isProperty()) before. Also this will display a warning in the application output if the property cannot be changed. Reviewed-by: Lasse Holmstedt
| * | | Doc: use const& in foreach when applicable.Olivier Goffart2010-07-2615-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Const reference are slightly faster than doing a copy of the object on each iteration. Lead by example by having this pattern right in our documentation
| * | | QGLBuffer::bind()/release() should not be const functions.Trond Kjernåsen2010-07-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more or less the same as in the QGLFramebufferObject::bind()/release() case. Task-number: QTBUG-12319 Reviewed-by: Kim
| * | | Use SSSE3 to convert from RGB888 to RGB32Benjamin Poulain2010-07-267-1/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converting from RGB encoded on 24bits to RGB encoded on 32 bits is quite inefficient. This type of conversion is common for some image format. The patch implement the conversion with SSSE3. This reduce by 3 the number of instructions, pushing the bottleneck to memory bandwidth. On Atom N450, the new benchmark is 40% faster for scanlines of 2000 pixels, 30% faster for scanlines of 32 pixels, and 15% slower for small images (3 and 8px). Reviewed-by: Olivier Goffart
| * | | Extend the build system to SSSE3Benjamin Poulain2010-07-262-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the build of QtGui to include generic compilation of files specific to SSSE3. Also extend qsimd_p.h for the new #includes.
| * | | CPU feature detection for x86_64Andreas Kling2010-07-261-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we've only done feature detection for i386 CPUs since we can assume all x86_64 processors have MMX/3DNOW/SSE2. No assumptions can be made about SSE3 and newer features, so now that we start using those, we need to check for their presence with CPUID on 64-bit processors as well.
| * | | Use the appropriate CPUID bitmap for detecting SSE3 etcAndreas Kling2010-07-261-6/+9
| | | | | | | | | | | | | | | | | | | | This information actually comes from ECX after CPUID(0x00000001), not EDX after CPUID(0x80000001)
| * | | Skip tst_QLineEdit::QTBUG697_paletteCurrentColorGroup on non-x11Olivier Goffart2010-07-261-0/+3
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-255-2/+123
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Stabilize tst_qlineedit.cpp QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow Fix QLineEdit's Highlight color when inactive.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-235-2/+123
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Stabilize tst_qlineedit.cpp QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow Fix QLineEdit's Highlight color when inactive.
| | | * | Stabilize tst_qlineedit.cppOlivier Goffart2010-07-231-9/+17
| | | | |
| | | * | QScriptEngineAgent: ensure that the top of the backtrace is correct in ↵Olivier Goffart2010-07-232-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exceptionThrow Reviewed-by: Jedrzej Nowacki
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-233-2/+29
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QLineEdit's Highlight color when inactive.
| | | | * | Fix QLineEdit's Highlight color when inactive.Pierre Rossi2010-07-233-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also updates QPalette's documentation regarding the current ColorGroup and operator==. Task-number: QTBUG-697 Reviewed-by: ogoffart
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-266-21/+172
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My changes for 4.7.0. fixed QDBUS export error Q_INVOKABLES added to Qt-DBus
| * | | | My changes for 4.7.0.axis2010-07-261-2/+20
| | | | |
| * | | | fixed QDBUS export errorEvan Nguyen2010-07-261-1/+1
| | | | |
| * | | | Q_INVOKABLES added to Qt-DBusEvan Nguyen2010-07-265-20/+153
|/ / / / | | | | | | | | | | | | Task-number: QTBUG-12397
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-252-1/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Drawer widget in a MainWindow disappears after returning from full screen mode.
generated by cgit v0.12 at 2024-10-25 04:29:57 (GMT)