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
* | 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
| | * | | Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already convert date/time format inside the getMacDateFormat, so no reason to do it again later. Reviewed-by: Prasanth
| | * | | Text cursor is not shown properly in line edits on Mac OS X.Prasanth Ullattil2009-12-163-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mac stlye disables the blinking cursor when there is a selection in the line edit. The cursor is not shown back when this selection is removed (either by mouse or key press events). This patch watches the selection changed signal from the line control and updates the cursor status accordingly. Task-number: QTBUG-6378 Reviewed-by: Olivier Goffart
| | * | | Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Marius SO Details: It worked fine for Makefiles since no checking is done of the flags. Now its fixed so it works for vcproj files too making it easier for people to build 64bit targets in Visual Studio.
| | * | | Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-168-181/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | Revert a change that is not yet complete and was pushed by mistake. This reverts commit 44f7c1e097582a704a06ccbbf516536b88ddcd3a.
| * | | Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-69/+84
| | | | | | | | | | | | | | | | | | | | | | | | This commit will be a duplicate of the same change applied elsewhere. Reviewed-by: Kurt Korbatits
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-1527-59/+373
| |\ \ \ | | |/ /
| | * | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-155-1/+47
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: mkspecs/macx-g++40/qplatformdefs.h
| | | * Add a mkspec for selecting gcc-4.0 on Mac OS X.Morten Sorvig2009-12-114-0/+190
| | | | | | | | | | | | | | | | | | | | This has one known use case: compiling with the 10.4u SDKi on 10.6. (cherry picked from commit 855f1705ceb15c303b55fcced8b0303d90352a44)
| | | * Fix crash in QFontDialog::getFont() on Mac 10.4Morten Johan Sørvig2009-12-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | [NSFontManager setTarget] is not available on 10.4. Rev-by: Richard Moe Gustavsen
| | | * Fix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.Thiago Macieira2009-12-094-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we made calls on a QDBusConnection that isn't connected, the d pointer is 0. Ensure we don't crash. Task-number: QTBUG-6571 Reviewed-by: Bradley T. Hughes
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-1520-59/+281
| | |\ \
| | | * | Calling removeToolBar() on native Mac toolbars (Cocoa) causes crash.Prasanth Ullattil2009-12-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hash and the list which stores the references are already cleared by the delegate function toolbarDidRemoveItem: There is no need to remove them manually after a call to [NSToolbar removeItemAtIndex]. Task-number: QTBUG-6200 Reviewed-by: Richard Moe Gustavsen
| | | * | Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista ↵miniak2009-12-151-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and higher This is necessary to allow Windows Explorer send the WM_TASKBARCREATED message to a Qt application (to recreate its QSystemTrayIcon-s) even when it is running in a higher UIPI privilege level. Merge-request: 1626 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| | | * | Changes to support locale change event for symbian platformdka2009-12-158-17/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subscribing to the locale change notification to be able to update the system locale whenever the user changes the current system locale. Also changed the initialization of the system locale to make construction of the QLocale object as lightweight as possible. So now the default contructor just creates a QLocale and QSystemLocale objects, but doesn't try to fill the cache in the latter with data from the system and postpones it until it is actually requested (most applications create QLocale objects on the stack and might not even use the data from the system locale, so we don't need to initialize system locale right away). Modified-by: axis Modified-by: Denis Dzyubenko Reviewed-by: Denis Dzyubenko Reviewed-by: axis
| | | * | Optimisations to gesture event filtering.Denis Dzyubenko2009-12-153-28/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we don't filter some events through the gesture manager and use QMap instead of QHash, which seem to be a bit faster in our cases. Reviewed-by: Olivier Goffart
| | | * | Fix compilation on HP-UX 11.11.Tristan Chabredier2009-12-153-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: thread/qthread_unix.cpp: In static member function 'static int QThread::idealThreadCount()': thread/qthread_unix.cpp:325: error: aggregate 'pst_dynamic psd' has incomplete type and cannot be defined thread/qthread_unix.cpp:326: error: 'pstat_getdynamic' was not declared in this scope Task-number: QTBUG-6576 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | * | Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
| | | | |
| | * | | doc: Final fix. Example image links now display the image.Martin Smith2009-12-153-1/+47
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4484
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-14109-898/+2632
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | QNAM Code: Do not re-abort or continue processing notifications.Markus Goetz2009-12-141-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This should finally enable us to use DirectConnection in QNetworkReplyHandler of QtWebKit. Reviewed-by: thiago
| | * | doc: Fixed erroneous qdoc error message.Martin Smith2009-12-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc reported a "No documentation" error for images used in examples, but these images aren't supposed to have documentation. Task-number: QTBUG-4484
| * | | Doc: Fixed an image reference.David Boddie2009-12-141-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Doc: Minor fixes to language.David Boddie2009-12-141-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-0852-192/+725
| |\ \ \
| * | | | Doc: Fixed references to "old" 2.x and "new" 3.x font name conventions.David Boddie2009-12-071-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me As-reported-by: Eskil
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-04239-1809/+3904
| |\ \ \ \
| * | | | | Doc: Fixed license information as requested by Legal.David Boddie2009-12-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Doc: Whitespace fix.David Boddie2009-12-041-46/+45
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Doc: Added links to missing examples and placeholder documentation.David Boddie2009-12-042-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-174-5/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update FBO docs to describe how QPainter changes the GL state (OCI) Fixes problem with clobs being handled as binary Disable depth testing during the 2D QGLWidget::renderText()
| * | | | | | Update FBO docs to describe how QPainter changes the GL stateRhys Weatherley2009-12-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a QPainter on a QGLFramebufferObject will not return the GL context to its original conditions, especially with the OpenGL2 paint engine. Update the docs to make this clearer. Task-number: QTBUG-6712 Reviewed-by: Daniel Pope
| * | | | | | (OCI) Fixes problem with clobs being handled as binaryBill King2009-12-172-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CLOB/NCLOB/LONG are actually strings, so treat them as such. Task-number: QTBUG-4461 Reviewed-by: Justin McPherson
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2009-12-171-0/+12
| |\ \ \ \ \ \
| | * | | | | | Disable depth testing during the 2D QGLWidget::renderText()Rhys Weatherley2009-12-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document the depth testing conditions for the 2D and 3D versions of the function. Task-number: QTBUG-5041 Reviewed-by: Daniel Pope
generated by cgit v0.12 at 2025-01-15 14:10:59 (GMT)