summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QString(" => QString::fromLatin1("Anders Bakken2009-09-291-1/+1
| | | | | | Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Espen Riskedal2009-09-293-3/+119
|\
| * Skipping two test cases due to Open C bug.Aleksandar Sasha Babic2009-09-291-0/+6
| | | | | | | | | | In Open C 1.6 release there is a bug in mmap(...) function. The bug has been reported.
| * Restoring cases that have been lost.Aleksandar Sasha Babic2009-09-292-3/+113
| | | | | | | | | | | | | | | | | | | | | | | | Due to bad merge some of the cases were removed. They have been restored now. Some adaptation for Symbian platform was needed as well. We must not forget that local socket implementation is based on RSocket, and therefore similar to having TCP_SOCKET as basckend. So, in soe places it we had to give some time for events to propagate by introducing qTest::wait() lines.
* | Fix compile of anomaly for S60 3.1 SDKEspen Riskedal2009-09-291-1/+1
|/ | | | | | It seems that for 3.1 we need to explicitly link with insock.dll as well Reviewed-by: Aleksandar Babic
* Adds QUrl::fromUserInput, gathered from QWebView::guessUrlFromString.Jocelyn Turcotte2009-09-293-0/+142
| | | | Reviewed-by: Thiago Macieira
* mark test as expected failure only when JIT is enabledKent Hansen2009-09-291-2/+8
| | | | With the interpreter it works.
* Add Slovenian translationJure Repinc2009-09-294-1/+17070
| | | | | Merge-request: 1320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Used the correct placeholder for the second argumentJure Repinc2009-09-291-1/+1
| | | | | Merge-request: 1320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* The text fit now in the screen.Alexis Menard2009-09-291-1/+1
| | | | | Task-number:QT-739 Reviewed-by:TrustMe
* Merge commit 'origin/4.5' into 4.6Oswald Buddenhagen2009-09-291-0/+13
|\ | | | | | | | | Conflicts: translations/qtconfig_ru.ts
| * minor fixes in Russian translationsRitt Konstantin2009-09-292-19/+27
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * My changelog for 4.5.3.Alexis Menard2009-09-291-0/+13
| |
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-295-2/+62
|\ \
| * | Make sure delayed events are cancelled when a state machine haltsKent Hansen2009-09-293-0/+60
| | | | | | | | | | | | | | | | | | | | | Otherwise the events might creep into the event loop if the state machine is restarted. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | Remove "inline" keyword from unused constructorsHarald Fernengel2009-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | Found during API review, make the private safety constructors follow the pattern of our Q_DISABLE_COPY macro. Reviewed-by: Robert Griebl
| * | Rebuild configure.exeKent Hansen2009-09-291-0/+0
| | | | | | | | | | | | Bring it up-to-date with commit 950f80620b56e9ed277240dc16087f3e4b53cc4a.
* | | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-2944-375/+501
|\ \ \ | |/ /
| * | Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-2910-60/+63
| | | | | | | | | | | | | | | | | | Note: Those messages are to be translated in Qt 4.6 for the first time. Reviewed-by: Kent Hansen <khansen@trolltech.com>
| * | Introduce state machine event priority, make it possible to cancel eventsKent Hansen2009-09-294-27/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The priority specifies whether the event should be posted to what the SCXML spec refers to as the "external" (NormalPriority) queue, or the "internal" (HighPriority) queue. Delayed events are now posted through a separate function, postDelayedEvent(). That function returns an id that can be passed to cancelDelayedEvent() to cancel it. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | Fix bug with posting events from HandleCommandL on Symbian.Jason Barron2009-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the loop level counter here because this is a system event entry point. Previously, posting a deferred delete event from this function (or triggering an action that posted this event) would end up with the event not being processed on time. The reason is that these events are only processed when the event loop that posted the event returns. Since the loop counter was not previously incremented, this "nested loop" was not detected so the event would only be processed when the main event loop returned which is typically at the end of the application. Reviewed-by: axis
| * | Fix auto-test failure for QFileSystemModel::sortAlexis Menard2009-09-291-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was failing on the farm because the rootPath for the model was invalid. QDir::rootPath on Windows return C:\ but in the farm the temp directory is in E:\ therefore the sort was only triggered on C:\ and this explain the failure. I also make comparaisons a bit more robust. Reviewed-by:TrustMe
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-294-100/+79
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platform-notes.qdoc src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | * added my changes to the changelogDenis Dzyubenko2009-09-291-1/+6
| | | | | | | | | | | | Reviewed-by: trustme
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-292-16/+41
| | |\
| | | * QGraphicsItem: cached embedded widget item is not repainted when widget is ↵Andreas Aardal Hanssen2009-09-292-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated When calling QGraphicsItem::update() on a cached item, the cache is meant to be invalidated. In the reported bug, the user had a fixed scene rect set for his scene, and removing an item caused the entire scene to be updated (marked as "all needs to be updated"). In this case, calling update() on the cached item did not cause the item's cache to be invalidated. The item's new appearance didn't show up until the next invalidation, which was the same call to update(), but this time without a preceeding full scene update. The fix is to always invalidate the cache, regardless. But only schedule a repaint of the item in some cases (e.g., in this case the whole scene was marked for update, in which case it's unnessary for this one item to schedule a repaint of itself). It's worth noting that in 4.6, removing an item be delete does not cause the whole scene to be updated, and because of that this error was not exposed. It's there nevertheless. Reviewed-by: bnilsen
| | * | Remove mentions of QtSW.Jason McDonald2009-09-292-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Remove mention of QtSW.Jason McDonald2009-09-291-1/+1
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| | * Tidy changes file for 4.5.3.Jason McDonald2009-09-291-99/+24
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update changes file for 4.5.3 for DirectFBAnders Bakken2009-09-281-3/+14
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Added my 4.5.3 changes to changelog.Samuel Rødal2009-09-281-0/+12
| | |
| | * tst_qnetworkcookiejar: Backported 4.6 changesMarkus Goetz2009-09-281-14/+14
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Mac: build issue (autotest stalls build)Richard Moe Gustavsen2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt static on Mac, the test included actually stops the build process, prompting the user for 'Promteroo?' The reason is that configure runs qmake on all the tests inside the test/auto directory, including the one that is meant for testing qmake itself. In other words, this test should not be qmake'ed when running configure, only when running the qmake auto test. However, the qmake auto test does not run the prompt test anymore either. So the solution for now is to just comment out the test project as well. Reviewed-by: alexis
| | * Mac: backport efd84105355 to silence visibility warningsRichard Moe Gustavsen2009-09-281-2/+1
| | | | | | | | | | | | | | | | | | | | | Make sure that we build objective c files with visibility hidden as default Reviewed-by: prasanth
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Espen Riskedal2009-09-291-2/+2
| |\ \
| | * | Enable QtScript by default on WindowsKent Hansen2009-09-291-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | | make sure QtWebKit and QtScript are included in the .sis fileEspen Riskedal2009-09-291-0/+5
| |/ / | | | | | | | | | | | | Task-number: QTBUG-4613 Reviewed-by: Aleksandar Babic
| * | Disable ECMAScript date test.Olivier Goffart2009-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | On slow machines, the time in which the reference and the result are computed may vary by one second. Task-number: QTBUG-4614 Reviewed-by: Kent Hansen
| * | Fix EGL/GLX surface leak when using texture-from-pixmapTom Cooksey2009-09-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The QScopedPointer changes mean that the pixmap data's reference count is now decremented after the cleanup hooks are called. The hooks should also only be called when the pixmap data gets deleted, so we don't actually have to check the reference count at all. Reviewed-by: TrustMe
| * | Fix typo.Alexis Menard2009-09-291-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Recorrect formextractor example build break after updating 3rdparty/webkitJocelyn Turcotte2009-09-291-7/+7
| | |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-29177-1253/+3879
| |\ \
| | * | After some discussion we decided to remove hasConflicts() from the API.Jan-Arve Sæther2009-09-296-49/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hasConflicts() does only make sense for a tool/editor of the layout, and how this function would help the tool is only guesswork at the moment. We keep the private API though, in order to let the autotests we inherited from Orbit pass.
| | * | Add missing docs for QGraphicsAnchorJan-Arve Sæther2009-09-291-0/+18
| | | |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-292-52/+42
| | |\ \
| | | * | Stabilize testsOlivier Goffart2009-09-292-52/+42
| | | | |
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-291-1/+1
| | |\ \ \ | | | |/ /
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-29181-1263/+3913
| | |\ \ \
| | * | | | Softkey fixes to QMenu tests.Jani Hautakangas2009-09-293-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys add two extra "Select" and "Back" actions to menu by default. First two actions in menu will be "Select" and "Back". Reviewed-by: Janne Anttila
| * | | | | fix warnings about declarations shadowing class members (autotest reported)Jeremy Katz2009-09-297-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
generated by cgit v0.12 at 2025-01-09 04:39:00 (GMT)