summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* showFullscreen() broken if UnifiedTitleAndToolBarOnMac is enabledCarlos Manuel Duclos Vergara2010-03-041-0/+2
| | | | | | | | | | | The problem here is caused by the fix to QTBUG-6200. For this fix we removed the lines that deleted the item because the iterator might be invalid at that point. However, we still need to delete the iterator. The solution is to not use the iterator and ask the hash to delete the item, since the remove function will not crash if the item is invalid. Task-number: QTBUG-8633 Reviewed-by: Prasanth
* Fix atk warning on startup in Qt apps wit QGtkStyleJens Bache-Wiig2010-03-041-1/+1
| | | | | | | | | | | | | | | While this is acknowledged as a bug in Gtk+ and confirmed fixed upstream, since some distros such as Ubuntu are not backporting this fix and it is easy to work around we should simply fix this for 4.6.3 instead. The problem is simply that atk assumes the button has a label or a labeled icon and spits out a warning if it does not. Additional info can be found here: https://bugs.launchpad.net/ubuntu/+source/gtk+2.0/+bug/484182 Reviewed-by:thorbjorn Task-number: QTBUG-8425
* Do not use realpath() with uclibcMarkus Goetz2010-03-041-0/+3
| | | | | Task-number: QTBUG-8365 Reviewed-by: denis
* Do not crash when loading themed icons staticallyJens Bache-Wiig2010-03-044-10/+34
| | | | | | | | | | | | We do not officially support static loading of icons. In fact they still crash for simple png cases due to missing X11 resources. But since we lazily create themed icons we can certainly avoid the crash in this case. You will not be able to use fallbacks here though, since we cannot know if a fallback should be used or not in this case. Reviewed-by: ogoffart Task-number: QTBUG-8666
* Doc: document what the timeout of -1 means in D-BusThiago Macieira2010-03-041-3/+14
| | | | Task-number: QTBUG-8729
* Avoid QString reallocation in QTextEngineAndreas Kling2010-03-041-4/+2
| | | | | | | | Calling QString::utf16() will cause reallocation (for null-termination) if the string was created via fromRawData(). Reviewed-by: Benjamin Poulain Reviewed-by: Simon Hausmann
* Fixed duplicate entry for windowsmobile in tests/auto/*.proRohan McGovern2010-03-041-1/+0
|
* Do not process uic3 test unless qt3support is enabled.Rohan McGovern2010-03-041-1/+2
|
* Make `make check' build the checked project.Rohan McGovern2010-03-032-1/+5
| | | | | | | | | | | The `check' rule ought to depend on the project being built, so one can simply do `make check' instead of `make && make check'. Note that there was already an attempt to do this for the autotests, but it did not work on non-Windows platforms, because $(DESTDIR_TARGET) is only used in the Windows makefile generators. Reviewed-By: Lincoln Ramsay
* Move tests into separate .pro files, based on Qt module.Rohan McGovern2010-03-0319-602/+671
| | | | | | | Having the tests in separate projects allows for some optimization strategies when running the tests (e.g. start running corelib tests while the rest of Qt is still compiling), and allows developers to run only a subset of tests when appropriate.
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-036-41/+41
|\ | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed unused macro. Fix runtime warning on Gtk versions < 2.16 Fix compile Follow-up to c1b067e: fix aliasing in QReadWriteLock too. Bug with toolbar focus on Mac
| * Removed unused macro.Adrian Constantin2010-03-031-4/+0
| | | | | | | | Reviewed-by: Stefano Pironato
| * Fix runtime warning on Gtk versions < 2.16Jens Bache-Wiig2010-03-032-14/+11
| | | | | | | | | | | | | | | | | | | | The label property was not added until version 2.16 of Gtk+ and using it will trigger a warning on older versions. Instead we create it with the label set instead which should work for 2.0 and up. Task-number: QTBUG-8537 Reviewed-by: Harald Fernengel
| * Fix compileJens Bache-Wiig2010-03-031-1/+0
| | | | | | | | Reviewed-by: cduclos
| * Follow-up to c1b067e: fix aliasing in QReadWriteLock too.Thiago Macieira2010-03-031-18/+12
| | | | | | | | | | | | | | The same pattern used in QMutexLocker was used in QReadLocker and QWriteLocker. Reviewed-by: Trust Me
| * Bug with toolbar focus on MacCarlos Manuel Duclos Vergara2010-03-032-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before doing anything we need to make sure that we don't leave anything in a non-consistent state. When hiding a widget we need to make sure that no mouse_down events are active, because the mouse_up event will never be received by a hidden widget or one of its descendants. The solution is simple, before going through with this we check if there are any mouse_down events in progress, if so we check if it is related to this widget or not. If so, we just reset the mouse_down and then we continue. In X11 and Windows we send a mouse_release event, however we don't do that here because we were already ignoring that from before. I.e. Carbon did not send the mouse release event, so we will not send the mouse release event. There are two ways to interpret this: 1. If we don't send the mouse release event, the widget might get into an inconsistent state, i.e. it might be waiting for a release event that will never arrive. 2. If we send the mouse release event, then the widget might decide to trigger an action that is not supposed to trigger because it is not visible. Task-number: QTBUG-8604 Reviewed-by: denis
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-035-38/+154
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Properly fixes crash when destroying a QGraphicsItem. Updating SQL binding docs to reflect reality.
| * | Properly fixes crash when destroying a QGraphicsItem.Yoann Lopes2010-03-033-37/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The focus is now properly cleared when hiding or showing focus scopes or when a child of a focus scope is destroyed. No change of behavior in how focus scope works for QML. Autotest included. Task-number: QT-2649 Reviewed-by: Andreas Aardal Hanssen
| * | Updating SQL binding docs to reflect reality.Bill King2010-03-032-1/+17
| | | | | | | | | | | | | | | Task-number: QTBUG-7218 Reviewed-by: Justin McPherson
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-032-3/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Reduced S60 softkey flickering caused by softkey image support.
| * | Reduced S60 softkey flickering caused by softkey image support.Janne Anttila2010-03-032-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | EikSoftkeyImage::SetLabel call seems to clear and redraw the softkeys every time when called. This commit removes the unnecessary calls to the method if given CBA is already in text mode. Reviewed-By: Sami Merila
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0324-1395/+2547
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build break in qapplication_x11.cpp. update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| * | | Fix build break in qapplication_x11.cpp.Adrian Constantin2010-03-031-0/+5
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0324-1395/+2542
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0224-1395/+2542
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | | * | update russian translations and phrasebookRitt Konstantin2010-03-029-1363/+2269
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | Allow platform specific values for the double click radius.Raino Priha2010-03-023-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2883 Reviewed-by: Volker Hilsheimer
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0212-30/+265
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | | | * | Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension.Thiago Macieira2010-03-021-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's probably also an MSVC extension, because the MSVC compiler has never complained about this fact, nor generated unintended code. Anyway, the only way is to reinterpret_cast the quintptr. It's not an aliasing violation to do it because we never access the integer as anything other than quintptr. Reviewed-By: Bradley T. Hughes
| | | | * | QNAM HTTP: Fix invoking a method when being destructed right nowMarkus Goetz2010-03-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | | | * | QAbstractSocket: Use new faster DNS functionMarkus Goetz2010-03-025-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use qt_qhostinfo_lookup which avoids the event loop when the DNS result is already cached. Reviewed-by: Thiago
| | | | * | Add DNS caching to QHostInfoMarkus Goetz2010-03-023-8/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default enabled, but it can be disabled via a compile flag. Reviewed-by: Thiago
| | | | * | Make the icon visible when set on an action in a QSystemTrayIcon on MacAndy Shaw2010-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a Carbon specific problem, it was already working fine in Cocoa Task-number: QTBUG-8521 Reviewed-by: richard
| | | | * | Carbon : Setting palette brush to a pixmap does not work.Carlos Manuel Duclos Vergara2010-03-021-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem occurs because we were drawing the pixmap and then clearing the buffer. This patch basically moves the clearing of the buffer to the start of the process instead of having it in the middle. Task-number: QTBUG-7800 Reviewed-by: Morten Sorvig
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-031-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QSound OSX; Fix memory leak.
| * | | | | QSound OSX; Fix memory leak.Justin McPherson2010-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0219-254/+372
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compile. Simplify DirectFB performance debugging QString::section: Fix crash with SectionIncludeLeadingSep flag Expand indicator would not be displayed after removal of a collapsed item's child Compile with GCC 3.3 Fixed rendering bugs when scrolling graphics items with drop shadows. 2nd part of revert of commit 435bbd4be73768f617e4a Revert "ItemViews: make it possible for chekcable items to get partiallyChecked" Prevented assert on 1 pixel wide / high images in qt_blurImage. skip tst_QDialog::throwInExec on WinCE, ARM platform Fix licenseCheck autotest Fixes: ODBC Driver expects 16bit when system is 32bit Make composition modes work better for DirectFB Don't disable alpha when filling with opaque color Add support for composition mode DSPD_DST in DFB Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file Fix build breakage in windowflags example
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-03-021-16/+87
| |\ \ \ \
| | * | | | Simplify DirectFB performance debuggingAnders Bakken2010-03-021-16/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow people to control whether or not to warn on/disable raster fallbacks using the following mechanism: export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="draw_pixmap|draw_text" export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="draw_lines" It's still possible to define QT_DIRECTFB_WARN_ON_RASTERFALLBACKS to something for legacy reasons. The environment variable check is only available in debug mode.
| * | | | | Fix compile.Bill King2010-03-021-30/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Stupid inconsistent constness/overall api Task-number: QTBUG-6928
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0219-236/+283
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QString::section: Fix crash with SectionIncludeLeadingSep flag Expand indicator would not be displayed after removal of a collapsed item's child Compile with GCC 3.3 Fixed rendering bugs when scrolling graphics items with drop shadows. 2nd part of revert of commit 435bbd4be73768f617e4a Revert "ItemViews: make it possible for chekcable items to get partiallyChecked" Prevented assert on 1 pixel wide / high images in qt_blurImage. skip tst_QDialog::throwInExec on WinCE, ARM platform Fix licenseCheck autotest Fixes: ODBC Driver expects 16bit when system is 32bit Make composition modes work better for DirectFB Don't disable alpha when filling with opaque color Add support for composition mode DSPD_DST in DFB Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file Fix build breakage in windowflags example
| * | | | QString::section: Fix crash with SectionIncludeLeadingSep flagOlivier Goffart2010-03-022-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And start is out of bounds. Reviewed-by: Thiago Reviewed-by: Joao Task-number: QTBUG-4306
| * | | | Expand indicator would not be displayed after removal of a collapsed item's ↵Gabriel de Dietrich2010-03-022-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | child While setting the hasChildren property of QTreeViewItem, "collapsed" and "not visible" were being mistaken. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7443 (cherry picked from commit 77670c3c0fdc3021356e212e94042a0b5a4f4f8c)
| * | | | Compile with GCC 3.3Olivier Goffart2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8554 Reviewed-by: Gabriel
| * | | | Fixed rendering bugs when scrolling graphics items with drop shadows.Samuel Rødal2010-03-023-43/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't clip source pixmaps to the device rect, as there's no way of knowing which parts of the source pixmap are needed for the part of the graphics effect that's unclipped. Reviewed-by: Bjørn Erik Nilsen
| * | | | 2nd part of revert of commit 435bbd4be73768f617e4aThierry Bastian2010-03-021-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a mess-up by git rebase... Reviewed-by: ogoffart
| * | | | Revert "ItemViews: make it possible for chekcable items to get partiallyChecked"Thierry Bastian2010-03-021-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 435bbd4be73768f617e4a4083a345d1d8d62daa3. Reviewed-By: ogoffart
| * | | | Prevented assert on 1 pixel wide / high images in qt_blurImage.Samuel Rødal2010-03-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to run qt_halfScaled on images less than 2px in either dimension. Particularly, avoid doing this from qt_blurImage, where that situation can happen as a result of a clipped QGraphicsEffect. Reviewed-by: Bjørn Erik Nilsen
| * | | | skip tst_QDialog::throwInExec on WinCE, ARM platformJoerg Bornemann2010-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rethrowing exceptions across DLL boundaries crashes on Windows CE ARM devices. This is a restriction of the Microsoft tools. See thread "(Re)throwing from a catch block across dll boundaries" in microsoft.public.windowsce.embedded.vc Reviewed-by: ninerider
| * | | | Fix licenseCheck autotestOlivier Goffart2010-03-021-1/+1
| | | | |