summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-151-1/+1
|\
| * Default section size is taken instead of some fixed valueninerider2009-10-151-1/+1
| | | | | | | | | | | | Test failed on different styles such as Windows Mobile. Reviewed-by: Ossi
* | Removed Symbian exemption from adding QtUiTools to browser demo.Miikka Heikkinen2009-10-151-1/+1
|/ | | | | | | | The exemption was originally added to make the demo compile when QtUiTools was not yet compiled for Symbian. Task-number: QT-1018 Reviewed-by: Janne Anttila
* Merge commit 'a814aba657288942b5beed70a2110446420f981c' into origin-4.6Olivier Goffart2009-10-1519-916/+1206
|\
| * Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-1543-1896/+3999
| |\
| * | Compile tests under WindowsOlivier Goffart2009-10-152-2/+2
| | |
| * | stabilize QTableView test on cocoaOlivier Goffart2009-10-141-1/+3
| | |
| * | Disable tst_QTableView::tabFocus to work when qt_tab_all_widget is disabledOlivier Goffart2009-10-142-5/+12
| | | | | | | | | | | | | | | Logic copied from the QMenu test Also do the same in the QButtonGroup test
| * | Split QFileDialog auto-tests in two separate dirs. This will allow slowAlexis Menard2009-10-143-867/+1033
| | | | | | | | | | | | | | | | | | machines to complete those tests before being killed by pulse. Reviewed-by:TrustMe
| * | Merge origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-1498-25573/+30439
| |\ \
| * | | Make the test working on random directories so we are sure there wasAlexis Menard2009-10-141-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | no crap before. Reviewed-by:ogoffart
| * | | Make the autotest pass for descending order in QTableWidgetPierre Rossi2009-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It failed after this commit: 19030e2af098e319e3c3f3883c51e28364bf3ccf Reviewed-by: ogoffart
| * | | Compile the QTableView test on MacOlivier Goffart2009-10-141-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Gabriel
| * | | Sorting bug in QTableView fixPierre Rossi2009-10-132-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the DisplayRole is identical for two or more items, any modification of one item (e.g. backgroundColorRole) may trigger a re-ordering, which is obviously not an behaviour to be expected. Same fix as the one used for QTreewidget in c9eacfa1c791e2d228a3c8f0c119d02d7f46ee02. Task-number: QTBUG-4856 Task-number: 262056 Reviewed-by: Olivier Goffart
| * | | Fix sorting after changing a QTableView's headerOlivier Goffart2009-10-132-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the sorting states in sync with the header when setting custom headers Reviewed-by: Gabriel Task-number: QTBUG-3128 task-number: 234926
| * | | Fix some of the QWidget test on CocoaOlivier Goffart2009-10-131-14/+3
| | | |
| * | | Fix graphicsview test on Cocoa.Olivier Goffart2009-10-132-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa doesn't support regions update and always update the bounding rect (see comment in QWidgetPrivate::update_sys in qwidget_mac.cpp) Change tests that checked that we get the exact regions. Reviewed-by: MortenS
| * | | Fixes tst_QGraphicsProxyWidget::setWidget_simple on MacOlivier Goffart2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the palettePropagation test tests that the palette does not propagate from the widget to the proxy. And on Mac, the default palette for the line edit is not the same as the default palette Reviewed-by: Alexis
| * | | Fix QUrl regression with setHost("::ffff:129.144.52.38")David Faure2009-10-132-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | toEncoded was returning an empty host instead of [::ffff:129.144.52.38] Merge-request: 1735 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | QMetaObject::activate: reordered mutex locks/unlocks around spyFlorian Vichot2009-10-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always call the callbacks unlocked to avoid deadlocks. (The others call to the callback ar unlocked) Reviewed-by: Olivier Goffart Merge-request: 1744
| * | | Itemview: fix regression concerning Ctrl+rubber band selectionsFrank Reininghaus2009-10-132-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a rubber band selection while Control is pressed in an itemview with extended selection, make sure that the selection state of the items inside the rubber band is toggled. This ammend commit 0644e3dce532b1df00a77d3a30c61d6b75d3ff30 Merge-request: 1759 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Reviewed-by: Gabriel Task-number: QTBUG-1435 Task-number: 191545
* | | | doc: Changed \reimp to \internal because base class version is.Martin Smith2009-10-152-2/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-4599
* | | | QSslSocket: Documentation enhancementMarkus Goetz2009-10-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Clarify about bytesWritten() and encryptedBytesWritten() Reviewed-by: David Boddie
* | | | Made Mac Cocoa use the input method hints when deciding on IM.axis2009-10-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior is to turn them off when inputting numbers or hidden text, which is the way it was in Qt 4.5. Task: QT-1938 Task: QT-2257 RevBy: Prasanth Ullattil
* | | | QNAM HTTP Code: Proceed POSTing on encryptedBytesWritten()Markus Goetz2009-10-152-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | ... not only on bytesWritten() Reviewed-by: Peter Hartmann
* | | | compile fix with namepaceshjk2009-10-153-0/+6
| | | |
* | | | Fix pointer grab issues in S60Shane Kearns2009-10-151-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did the long awaited "refactor me" in QSymbianControl::HandlePointerEvent Pointer is grabbed by MousePress, and released by MouseRelease - unless already globally grabbed. Pointer events are routed to the widget that grabbed the mouse. Task-number: QTBUG-4695 Task-number: QTBUG-4674 Reviewed-by: axis
* | | | fix compilation with namespaceshjk2009-10-151-2/+6
| | | |
* | | | doc: Clarified when setDefaultFormat() is ignored by constructors.Martin Smith2009-10-151-9/+15
| | | | | | | | | | | | | | | | Task-number: QTBUG-4443
* | | | Compile on Carbon.Morten Johan Sørvig2009-10-151-0/+4
| | | | | | | | | | | | | | | | ifdef out QCocoaPrintPanelDelegate.
* | | | Signal for an update when the cursor is visibleAlan Alpert2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug against QFxTextInput is actually due to a bug in QLineControl. Task-number: QT-2319 Reviewed-by: Martin Jones
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-153-35/+0
|\ \ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-10-154-32/+10
| |\ \ \ \
| * | | | | Remove qdocconf files for the old mac-specific source package.Jason McDonald2009-10-153-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are not used for the qt-everywhere source packages, and the platform-specific source packages are no longer needed. Reviewed-by: Trust Me
* | | | | | qt_paint_device_metric() for fetching metricsRhys Weatherley2009-10-158-34/+11
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom window surfaces, graphics systems, and Qt/Embedded screen drivers often need to access QPaintDevice::metric(), but it is protected. Hence the growing number of friends in QWidget and QImage. The qt_paint_device_metric() function provides a more future-proof approach that doesn't require lots of friends. Reviewed-by: Gunnar
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-155-69/+52
|\ \ \ \ \ | |/ / / /
| * | | | Change the frame rate property to a qreal from a QPair<int,int> rationalAndrew den Exter2009-10-153-68/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While a rational number is a common way to represent a frame rate, QPair<int, int> isn't a proper numeric type meaning it can't be used as anything more than an identifer for an exact frame rate without being converted to a real, or extending it to a proper rational type. Rev by: Justin McPherson
| * | | | Removed assertion from QComboBox::removeItem()Stian Sandvik Thomassen2009-10-152-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made QComboBox::removeItem() do nothing instead of asserting if index is out of range. Reviewed-by: Andy Shaw
* | | | | Centralize all GL paint engine creations into qt_qgl_paint_engine()Rhys Weatherley2009-10-154-32/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qt_qgl_paint_engine() function was being used by QWS, but there's no reason why it can't be used by other platforms too. This should also fix ES 2.0 paint engine support under QWS, which was stubbed out. Reviewed-by: Sarah Smith Reviewed-by: Gunnar
* | | | customshader won't work on OpenGL/ES 1.1 so disable for those platformsRhys Weatherley2009-10-151-1/+5
| |_|/ |/| | | | | | | | Reviewed-by: trustme
* | | Update IBY file to contain all Qt modules, inc. phonon, multimedia, sqlIain2009-10-141-0/+8
| | | | | | | | | | | | Reviewed-by: Janne Koskinen
* | | Cocoa: QInputDialog autotest reveals event dispatcher bugRichard Moe Gustavsen2009-10-141-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Cocoa, we sometimes need to block sending posted events (because we need to flush the event que now and then without touching Qt events). But we forgot to do same for timer callback. So this patch makes sure that we dont send the timer event immidiatly if we are just flushing the event que. Rev-By: brad
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Janne Koskinen2009-10-1412-1741/+3682
|\ \ \
| * | | Update Polish translationsJarek Kobus2009-10-148-1730/+3657
| | | |
| * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-141-10/+16
| |\ \ \
| | * | | Fix tst_QSidebar::addUrls() on Symbian.Liang QI2009-10-141-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian, QDir::rootPath() and QDir::home() are same. RevBy: Janne Anttila
| * | | | Rebuilt configure.exe.Miikka Heikkinen2009-10-141-0/+0
| |/ / / | | | | | | | | | | | | Reviewed-by: Janne Koskinen
| * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-144-59/+81
| |\ \ \
| | * | | Bump heap and stack size for Phonon plugins.Frans Englich2009-10-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required by the Helix plugin. As discussed with Dallas team/Fu Liz. Reviewed-by: Shane Kearns
| * | | | Synced QT_BUILD_PARTS in .qmake.cache and projects.pro for Symbian.Miikka Heikkinen2009-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects.pro is forcing QT_BUILD_PARTS to omit docs and translations, but configure still outputted those into .qmake.cache. Fixed configure to also omit them for Symbian builds to make building demos work equally whether built by from root or not. Task-number: QT-1018 Reviewed-by: axis