summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update QtGui def fileShane Kearns2009-10-221-1/+1
| | | | | | | One private export has been changed from non-const to const pointer parameter Reviewed-by: TrustMe
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-22121-3789/+6984
|\
| * Use the qsreal type instead of double when working with QtScript numbersKent Hansen2009-10-224-7/+7
| | | | | | | | | | | | | | | | The idea is that qsreal can be typedef'ed to float on platforms where it's appropriate. Since the QScriptValue ctor takes a qsreal, we should not convert it to a double internally. Reviewed-by: Olivier Goffart
| * Add Windows 7 with VC++2008 as a Tier 2 supported platform.Volker Hilsheimer2009-10-221-2/+0
| |
| * Merge branch 'origin/4.6' into widgets-team/4.6Olivier Goffart2009-10-22147-3860/+8128
| |\
| | * QtScript: Compatibility with 4.5Olivier Goffart2009-10-222-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | We must register the same type as they were registered in Qt 4.5 Reported on qt4-preview-feedback mailing list. Reviewed-by: Kent Hansen
| | * Qt patches to libpng sources.aavit2009-10-221-2/+12
| | | | | | | | | | | | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to 1.2.40.
| | * Upgrade libpng to version 1.2.40aavit2009-10-2286-3626/+6428
| | | | | | | | | | | | | | | This commit contains a clean copy of the libpng source distribution. The Qt patches will follow in a separate commit.
| * | Fixed crash in tst_qabstractitemview.Gabriel de Dietrich2009-10-211-3/+11
| | | | | | | | | | | | Reviewed-by: trust-me
| * | The QMenuPrivate::activationRecursionGuard has to be a boolean.Marius Bugge Monsen2009-10-211-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Make QMenu::activateCausedStack() exception safe.Marius Bugge Monsen2009-10-211-3/+11
| | | | | | | | | | | | | | | | | | Use an internal class to reset the activationRecursionGuard when the scope is closed. Reviewed-by: Leo Cunha
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-2159-30608/+55424
| |\ \
| * | | Clips color interpolation to range [0, 255]Leonardo Sobral Cunha2009-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoid warnings when using easing curves that progress outside the range [0.0, 1.0]. Patch proposed by warwick. Reviewed-by: Warwick Allison
| * | | Merge branch 'qgal-api' into 4.6Jan-Arve Sæther2009-10-212-7/+18
| |\ \ \
| | * | | Group the spacing functions together, and add a sizePolicy property.Jan-Arve Sæther2009-10-212-7/+18
| | | | | | | | | | | | | | | | | | | | Improve the documentation for size policy.
| * | | | Fixes to the way animations are registered to the timerThierry Bastian2009-10-211-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could happen that an animation would be unregistered when it shouldn't. Reviewed-by: Leo Cunha
| * | | | Improve performance when starting a lot of animationsThierry Bastian2009-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We avoid stopping/starting the timer over and over again Patch suggested by Aaron. Reviewed-by: Aaron Kennedy
| * | | | Optimization in qt_closestItemFirst private functionLeonardo Sobral Cunha2009-10-201-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to traverse the tree again to access the topLevelItem in case there is no common ancestor. Reviewed-by: bnilsen
| * | | | Moved private function to test which graphic items is in front of the otherLeonardo Sobral Cunha2009-10-205-70/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is moved to graphicsitem private because it is needed by multi-touch event handling and is not specific to bsptreeindex. Reviewed-by: bnilsen
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-202-15/+27
| |\ \ \ \
| | * | | | Extended commit 6c1388ee for LeftToRight flowGabriel de Dietrich2009-10-202-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-test updated. As a bonus, stabilized tst_QListView::task262152_setModelColumnNavigate. Reviewed-by: Thierry
| * | | | | Merge branch 'qlayout-make_adjustSize_better' into 4.6Jan-Arve Sæther2009-10-202-2/+30
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make adjustSize work even if there is a pending LayoutRequest event.Jan-Arve Sæther2009-10-202-2/+30
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original report was that the customer did resize(main.sizeHint()) instead of the main.adjustSize(); Note that resize(main.sizeHint() still does not work. However, calling main.adjustSize() should now do what the original reporter wanted. The problem was that the resize did not work, because at the point of the resize the minimumHeight of main was still 22 (8+6+8), and we tried to resize it with a new height of 10. The resize would bound the height up to 22, and the main widget would then get a size of (200x22). The reason why it still had a minimumHeight of 22 was that it was the minimumSize of the previous layout configuration. Unfortunately the new minimumSize of the widget hadn't been updated yet because there was a LayoutRequest event in the queue that hadn't been processed yet. (This LayoutRequest was triggered by that we called invalidate() from hide()). Thus, processing the event queue immediately after the hide() could also have been a workaround for this issue. There is no really good fix for this issue (and it does not seem to be a common problem) without introducing a risk for regressions. Due to that we therefore decided to provide a fix in QWidget::adjustSize(). Reviewed-by: paul
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-20283-5072/+5381
| |\ \ \ \
| | * | | | fix for QTreeView to not animate if there are no visible childrenThierry Bastian2009-10-201-4/+6
| | | | | |
| | * | | | Fixed QTreeView trying to animate when parent item has no childThierry Bastian2009-10-202-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now check that the item has children before animating. Reviewed-by: Alexis
| | * | | | Fixed a bug in that could unregister not-registered animationsThierry Bastian2009-10-201-2/+3
| | | | | |
| | * | | | QPauseAnimation autotests fixedThierry Bastian2009-10-201-1/+2
| | | | | |
| | * | | | adding autotestsThierry Bastian2009-10-201-0/+14
| | | | | |
| | * | | | Make the default duration of pause animations 250msThierry Bastian2009-10-201-1/+2
| | | | | |
| | * | | | Make the total duration of animation be 0 if duration is 0Thierry Bastian2009-10-201-8/+8
| | | | | |
| | * | | | Fix bug in embedded dialog demo with tab focus.Alexis Menard2009-10-203-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On embedded dialog pressing tab stop changing the focus when the focus was given to QFontComboBox. It's because QFontComboBox embed a QLineEdit in order to allow editing. But this QLineEdit is a focus proxy so we need to special case that. The logic is the same in QApplication. Be careful when changing one of them. Task-number:QTBUG-4818 Reviewed-by:jan-arve Reviewed-by:ogoffart
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-202-17/+7
| | |\ \ \ \
| | * | | | | Fixed wrong scrolling in QListView with hidden rows in ListModeGabriel de Dietrich2009-10-203-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flow positions in ScrollPerItem mode did not take the hidden rows into account when configuring the vertical scroll bar. A mapping between the scroll bar value and the flow position has been added. Auto-test included. Task-number: QTBUG-2233 Reviewed-by: Thierry
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-20265-4993/+5043
| | |\ \ \ \ \
| | * | | | | | QToolButton popup menu is shown at wrong position when embedded in aAlexis Menard2009-10-208-32/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsView. The main problem here is that QWidget assume that they are in the screen somewhere, which means inside the available geometry provided by QDesktopWidget. But in QGraphicsView the button can be in a position that is way bigger than the screen resolution. Lot of widgets make this assumption when positionning subpopups or submenus. Instead of applying the same code on tons of QWidgets, it's better to have an helper function in desktop widget which catch this case. It's not pretty (since it has nothing to do with QDesktopWidget) but we don't have better solution. Task-number:QTBUG-3822 Reviewed-by:brad
| * | | | | | | Add some docs that explicitly mentions how we handle cycles in the treeJan-Arve Sæther2009-10-202-0/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was reported for QGraphicsAnchorLayout, but affects all QGraphicsLayout subclasses. However, since it is not even handled properly in QGraphicsItem::setParentItem() it should be fine that we don't try to deal with this issue. Thus, the layouts are "consistent" with graphics items when it comes to detection of cycles in the tree.
* | | | | | | Update 4.6 def filesShane Kearns2009-10-222-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | | | QtGui release/debug binary compatibilityShane Kearns2009-10-226-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui had some debug functions only exported in the debug build. Now these are exported in release mode as well, but as stubs (i.e. no debug output is generated). Reviewed-by: Thiago Macieira
* | | | | | | Lowering toplevel widget puts app to background.Miikka Heikkinen2009-10-221-2/+7
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since raising toplevel widget nowdays brings the whole app to top, logically lowering toplevel widget should put the app to background. Reviewed-by: axis
* | | | | | qfiledialog2 added to tests/auto/auto.proJoerg Bornemann2009-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: alexis
* | | | | | qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
* | | | | | consider message id when comparing messagesOswald Buddenhagen2009-10-222-2/+12
| | | | | |
* | | | | | id-based: do not drop unfinished untranslated messagesOswald Buddenhagen2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | otherwise the fallback to use the source string is rather pointless
* | | | | | id-based: use source strings instead of empty translations only for ↵Oswald Buddenhagen2009-10-222-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | unfinished messages
* | | | | | actually guess the target language from the file nameOswald Buddenhagen2009-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | --help says it does, but it didn't really.
* | | | | | QDom autotests: make test fail instead of time outPeter Hartmann2009-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce a QFAIL for now until problem is fixed Reviewed-by: Carlos Duclos
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Friedemann Kleint2009-10-2241-138/+1581
|\ \ \ \ \ \
| * | | | | | Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-223-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The projection to 2D needs to be done when the rotation is applied, not after all transformations have been applied. Reviewed-by: trustme
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-22136-31352/+57141
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp