summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-241-2/+7
| | | | | | | | | | | This is a regression fron 4.6 release. Menu entries with some specific roles are automatically merged to the application menu. They are now translated based on the context "MAC_APPLICATION_MENU" instead of "QMenuBar" context. This patch eanbles the use for both contexts. Task-number: QTBUG-13878 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)
* Fix a crash with D&d on mingwThierry Bastian2010-09-241-6/+6
| | | | | | | | | The Drag&Drop callbacks need to be correctly aligned to not crash in the graphics SSE code. Task-number: QTBUG-13787 Reviewed-by: benjamin poulain (cherry picked from commit a7c28aa588417c0a75f82d55019814443f889340)
* QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-242-0/+26
| | | | | | | | | | | | | | When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)
* Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
| | | | | | | | | QTextControl should no longer inherit the layout direction of parent widget as its default text direction. Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Lars Knoll (cherry picked from commit 6397e5bc49f11e20a9d1838d8d8df46dd9486263)
* Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| | | | | | | | | | For QLabel, text direction should be determined by actual text (if it's a simple text label) or the textDirection() property of the defaultTextOption of corresponding QTextDocument. Task-number: QTBUG-13552 Reviewed-by: Lars Knoll (cherry picked from commit 9b20aac0ad83b917c46cc44b78dc90fb1d238fe8)
* Update QtDeclarative def filesJoona Petrell2010-09-232-3/+9
| | | | (cherry picked from commit 90431a96ca0558ac82ccd588faf1b0aed55abbfe)
* Fix example after changes to font.letterSpacing.Yann Bodson2010-09-231-1/+2
| | | | (cherry picked from commit 5372b313127302d94c748732052dd62d0e38a1cd)
* Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-233-5/+43
| | | | (cherry picked from commit eef26bc8521da62db0dced6796eceb7c27f64160)
* Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-233-3/+44
| | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones (cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
* Rebuild configure.exe.Jason McDonald2010-09-231-0/+0
|
* qmake: fix quoting of moc callsJoerg Bornemann2010-09-231-2/+2
| | | | | | Task-number: QTBUG-13782 Reviewed-by: ossi (cherry picked from commit 36fc9e830b828b69c4df775c68c07c25c9bab4cf)
* QNAM: Use QFileNetworkReply for qrc:/ URL schemaMisha Tyutyunik2010-09-232-3/+6
| | | | | | | | Resources do not need network access and can be quicker loaded with QFileNetworkReply. Reviewed-by: Markus Goetz (cherry picked from commit 5120dfec47475dd37f51df4dda9a4ef8494036ab)
* Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-234-9/+30
| | | | | | | | | | | | | | | Our glyph caching system doesn't take GL texture size limitation into account, and assumes you can create an infinitely large texture. On top of that, the cache will never create a cache that is wider than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll hit the texture size limit even faster. With this patch the entire texture is utilized. However, to fix in properly we need to support having multiple texture for each font engine. That will be fixed shortly (see task QTBUG-13784). Task-number: QT-3971 Reviewed-by: Eskil (cherry picked from commit eb2926a2f9607e985b8bca54346e6fdf91343247)
* Update QtGui def filesJoona Petrell2010-09-232-2/+10
| | | | (cherry picked from commit 36705197479337ccf341a4c39a6e5f44d3fb2322)
* Fix Symbian def file for a9e5329168Kai Koehne2010-09-231-0/+1
| | | | | Reviewed-by: Thomas Hartmann (cherry picked from commit a371562d870abb421682dcf83d447e5d5c9e82fa)
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-2310-20/+114
| | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne (cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
* Update QtCore bwins def fileJoona Petrell2010-09-231-2/+2
| | | | (cherry picked from commit 580fbb6a48b9cc2fbd0a011449d0c3a73c939ff9)
* Qt headers must be included before X11 headersBenjamin Poulain2010-09-221-3/+3
| | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal (cherry picked from commit f1f986dfe40f82fca1a8a27f5f02e1a9f7818fd0)
* Fixed compilation of MeeGo graphics system without eglext.hSamuel Rødal2010-09-221-1/+0
| | | | | | | We don't rely on this header, so there's no need to include it. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> (cherry picked from commit a65f53a09c2a5950bd8b98fd791dc413bb11f9bf)
* Avoid creating copy of an image in memory when storing as jpegaavit2010-09-221-28/+13
| | | | | | Task-number: QT-3871 Reviewed-by: Kim (cherry picked from commit 7efe816d028876487a6a44d97ed58a807da7d4d8)
* Bump version to 4.7.1.Jason McDonald2010-09-2221-50/+50
| | | | | Reviewed-by: Trust Me (cherry picked from commit 63394650e71f23a036edbc0df29a1b6b19366269)
* Make build on SymbianBea Lam2010-09-222-29/+33
| | | | (cherry picked from commit 68281ec913e2a69682f00bf22c291b15ea4ce542)
* Improve error messagesBea Lam2010-09-222-7/+7
| | | | (cherry picked from commit af29c555a29ebcdb1d962176912478212c9c7e65)
* Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-226-58/+698
| | | | | | | | | | | | that the view is updated (currently the model data changes but the view does not). In flat-model mode, get() now returns a QScriptClass-type object so that changes to the returned object are received, and for nested-model mode, the fix adds a QDeclarativeOpenMetaObject subclass and ModelNode::listIndex so that itemsChanged() can be emitted when the node data changes. Task-number: QTBUG-12363 (cherry picked from commit c2bbef949126826f0330c69dff1a8c96919f69a5)
* Make it clear that private ListModel constructor is only for workerBea Lam2010-09-224-20/+33
| | | | | | agent. Also set up the worker list copy in the ListModel implementation instead of the agent. (cherry picked from commit c298ed31f8dfa917e5428820aecd39234b4c9097)
* Remove duplicated move() implementationsBea Lam2010-09-221-34/+26
| | | | (cherry picked from commit 16013f8970471f161db9fcc728a8c263e5bb84a7)
* Doc changesBea Lam2010-09-221-4/+4
| | | | (cherry picked from commit ee9c9e412fd5467e82be446603e71bee620ff04b)
* Improved output of patch_capabilities.pl scriptMiikka Heikkinen2010-09-221-19/+64
| | | | | | | | | | More detailed output of what was patched reduces user confusion. Properly prefixed output messages can also be easily parsed by IDEs like Qt Creator. Task-number: QTBUG-13760 Reviewed-by: Janne Koskinen (cherry picked from commit 1eeec88caa45d7c3f6b8371bc84bb8d172b0b02e)
* qtextcodec_symbian: Add few aliasesOlivier Goffart2010-09-211-2/+2
| | | | | Reviewed-by: Denis (cherry picked from commit 2b230dbc9a784e577c08fa25db3e975952849297)
* Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-213-11/+21
| | | | | | | | | Check that we no longer hold a reference to the item before setting onPath to false. Task-number: QTBUG-13689 Reviewed-by: Michael Brasser (cherry picked from commit 7e6b2b2b95bc1db77544b898ec45ea4a2683e435)
* PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-212-75/+112
| | | | | | | | | | | | Since it didn't accept the press it didn't get a grab, so its events were always filtered away by Flickable. Use the same implementation as Flickable, i.e. create private handler functions for mouse events and accept normal events in the mouse*Event() methods. Task-number: QTBUG-13687 Reviewed-by: Michael Brasser (cherry picked from commit a4cadd1b1fd30a1989d56f6c06deb8fed4f79882)
* Fix worker agent to emit ListModel itemsChanged() correctly when set()Bea Lam2010-09-211-1/+1
| | | | | | | and setProperty() are called Task-number: QTBUG-13666 (cherry picked from commit ff075380d7ec1472fcdff06b3f39ffdc02b7f112)
* Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-214-11/+14
| | | | | | Task-number: QTBUG-13653 Reviewed-by: aavit (cherry picked from commit 5220c371176951e12d525ac7908861d111c367d0)
* Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-211-4/+4
| | | | | | Task-number: QTBUG-13437 Reviewed-by: Janne Koskinen (cherry picked from commit 0cbb1a488c4199ad06b8ab63a9d6bf09fc8a6911)
* Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the ↵Joona Petrell2010-09-211-3/+5
| | | | | | | | query has already quit Task-number: QTBUG-13041 Reviewed-by: Aaron Kennedy (cherry picked from commit 0c971a9801766a6d7646d1c1c413354f74db41e4)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-171-2/+2
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unnecessary textcodec aliases from qtextcodec_symbian.cpp
| * Remove unnecessary textcodec aliases from qtextcodec_symbian.cppAlessandro Portale2010-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | MS_KANJI and Java UTF-8 are not needed because both had aliases which only differ in character case. Qt handles these aliases case insensitive, however. The removal speeds the lookup up, a bit. Reviewed-By: Olivier Goffart Task-Number: QTBUG-13565
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1710-38/+93
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Export qt_directfb_.* functions in plugin as well Added autotest for QPixmap::size() with null pixmaps. Update Symbian def files. QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| * Export qt_directfb_.* functions in plugin as wellAnders Bakken2010-09-173-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions can be a big help in debugging rendering errors in an application and can even be handy to use for real functionality. While it requires the app to explicitly link to the plugin (when compiling with -plugin-gfx-directfb this is still much better than not exporting them). Since this was the only use-case for QT_DIRECTFB_PLUGIN it's probably better to take that define out. Merge-request: 2470 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Added autotest for QPixmap::size() with null pixmaps.Samuel Rødal2010-09-171-0/+5
| | | | | | | | | | | | For change 82575a9f6123eed3e858 which fixed a behavioural regression. Reviewed-by: Olivier Goffart
| * Update Symbian def files.Bjørn Erik Nilsen2010-09-171-2/+2
| | | | | | | | | | | | | | Build error reported by CI gate, commit: 9601abf3b03cfef589c092182bec3672fab6cde0 Reviewed-by: jbarron
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-175-31/+85
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-175-31/+85
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-165-31/+85
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | | | * QGraphicsItem::childrenBoundingRect behavior breaks ↵Bjørn Erik Nilsen2010-09-163-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect::sourceBoundingRect(). Context: QGraphicsEffect::sourceBoundingRect() returns: item->boundingRect() | item->childrenBoundingRect(); Problem was that item->childrenBoundingRect() adjusted the children's bounding rect with the children's ancestor effects (child -> root item), which means the source bounding rect was bigger than needed. We should only account for effects downwards in the hierarchy. root (has effect) | item (has effect) | child | grandChild Auto test included. Task-number: QT-3633, QT-3828 Reviewed-by: samuel
| | | | * Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-163-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression after: f5c5e20a Problem was that the cached bounding rect was never invalidated. We can also remove the cached bounding rect in QGraphicsEffectSource because QGraphicsItem::childrenBoundingRect now clips by default. This basically means partially reverting above commit and invalidate whenever ItemClipsChildrenToShape flag changes. Auto test included. Task-number: Discovered while investigating QT-3633 Reviewed-by: samuel
| | | | * Compile on MacEskil Abrahamsen Blomfeldt2010-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extern missing symbol Reviewed-by: Fabien Freling
| | | | * Ensure building of WebKit and QtConcurrent are disabled with SunCC.Pierre Rossi2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As there are versions of SunCC > 5.9 Reviewed-by: TrustMe
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-1711-112/+197
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implement QAudioInput::suspend() using CMMFDevSound::Stop() Discard buffer pointer when DevSound is stopped Suppress overflow errors raised by Symbian DevSound during playback Discard empty buffer on call to QAudioOutput::resume() Permit QAudioOutput::processedUSecs() to be called immediately after start() Discard all DevSound buffers held when QAudioInput::suspend() called Fixed buffer overrun in Symbian QAudioInput backend QS60Style does not show checkbox for checkable item in QTreeView Load environment.prf from Symbian SDK if it exists there Remove pre-Symbian3 plugins from Symbian3 and later builds Panic in qs60style.cpp while drawing a QTreeView
| * | | | | Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As with playback mode, lack of support for CMMFDevSound::Pause() in DevSound's recording mode causes problems on some devices. Specifically, while QAudioInput works fine on the Nokia 5800, this bug was observed on the Nokia N8. This fix means that suspending and resuming audio input will work correctly on all devices. Task-number: QTBUG-13506 Reviewed-by: Derick Hawcroft
generated by cgit v0.12 at 2025-03-20 11:54:28 (GMT)