summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0512-179/+1964
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix opening a network session multiple times in succession. Fix synchronous dispatch in ICD in non-main threads. Russian translation update QNAM HTTP: Download last chunk properly when readBufferSize() limited Prevent access to non-existent memory in QGL2PEXVertexArray Prevent excessive seeks in xbm detection
| * Fix opening a network session multiple times in succession.Aaron McCarthy2010-11-051-1/+1
| | | | | | | | | | Don't try to open the network session if there is already an in progress open request.
| * Fix synchronous dispatch in ICD in non-main threads.Aaron McCarthy2010-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | ICD DBus signals always come in via the main thread. During synchronous dispatch these signals were not being emitted when expected because no event loop is running in the destination thread. Fixed by added a call to QCoreApplication::sendPostedEvents(object, QEvent::MetaCall) in the synchronous dispatch loop. Task-number: QTBUG-15004
| * Russian translation updateSergey Belyashov2010-11-046-162/+1933
| | | | | | | | | | Merge-request: 895 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * QNAM HTTP: Download last chunk properly when readBufferSize() limitedMarkus Goetz2010-11-042-6/+8
| | | | | | | | | | | | Task-number: QTBUG-13431 Task-number: QTBUG-6276 Reviewed-by: ogoffart
| * Prevent access to non-existent memory in QGL2PEXVertexArrayTopi Reiniö2010-11-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | QGL2PEXVertexArray::addClosingLine() uses using QDataBuffer::add() to add a QPointF at the end, with a const reference to another value in the same array. As add() resizes and possibly relocates the buffer, an already-released memory location may be accessed. This change copies the value into a temporary variable before resizing the array. Task-number: QTBUG-14944 Reviewed-by: Samuel
| * Prevent excessive seeks in xbm detectionHarald Fernengel2010-11-041-8/+17
| | | | | | | | | | | | | | | | | | When auto-detecting an image type, the xbm handler would read the entire file just to figure out that it's not an xbm. This patch limits the read to maximum 4k and also breaks if line length >= 299. Task-number: QT-4021 Reviewed-by: Robert Griebl
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-059-40/+204
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Doc: Correcting character escape bug Doc: Clarified the lifetime of the session bus connection. Doc: Added a snippet showing the default BorderImage tiling behavior. Doc: using pointer member variables and language change Doc: Added more instructions to help with device file permissions. Doc: Mentioned default values for the BorderImage tile modes. Document the difference between +0.0 and -0.0 for QPointF and QSizeF.
| * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-0417-69/+271
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-039-30/+68
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-031-32/+124
| | |\ \ \
| | | * | | Doc: using pointer member variables and language changeLeena Miettinen2010-11-031-32/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Friedemann Kleint Reviewed-by: Martin Smith
| | * | | | Doc: Clarified the lifetime of the session bus connection.David Boddie2010-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | * | | | Doc: Added a snippet showing the default BorderImage tiling behavior.David Boddie2010-11-031-0/+55
| | | | | |
| | * | | | Doc: Added more instructions to help with device file permissions.David Boddie2010-11-032-2/+9
| | | | | |
| | * | | | Doc: Mentioned default values for the BorderImage tile modes.David Boddie2010-11-031-0/+2
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-03686-59478/+44554
| | |\ \ \ \ | | | |/ / /
| | * | | | Document the difference between +0.0 and -0.0 for QPointF and QSizeF.David Boddie2010-11-032-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Robert Griebl
| * | | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-046-38/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove code changes that were NOT intended as part of the fix Wordwrap QInputDialog label in Symbian Use qtmain.lib to provide entry point for all Symbian applications
| * | | | | Remove code changes that were NOT intended as part of the fixSami Merila2010-11-042-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some unknown reasons (read: missed git checkout -f), few code line changes which were NOT part of fix for QTBUG-14331 crept into the commit. These are now removed with this fix. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-043-19/+7
| |\ \ \ \ \
| | * | | | | Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-043-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Open C's libcrt0.lib to provide entry point caused problems for applications that launched other processes, as Open C retains a handle to all launched processes even after said processes terminate. Task-number: QTBUG-14735 Reviewed-by: axis
| * | | | | | Wordwrap QInputDialog label in SymbianJanne Koskinen2010-11-041-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable wordwrapping for QInputDialog in Symbian to allow longer texts to be displayed without cutting them off. Fixes issue with javascript prompt not showing long texts. Task-number: QT-4008 Reviewed-by: Sami Merila
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-047-295/+353
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix bearermonitor when building for Maemo in scratchbox.
| * | | | Fix bearermonitor when building for Maemo in scratchbox.Aaron McCarthy2010-11-047-295/+353
|/ / / / | | | | | | | | | | | | | | | | Use the correct ui file when building in scratchbox. Remove use of message boxes.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0310-25/+66
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: The lastCenterPoint should be equal to centerPoint for new gestures. PinchGesture: lastRotationAngle should start at 0. tst_qnetworkreply: Add testcase for unknown authentication method QNAM: Reset authenticator state properly between requests msvc: enable unreferenced code elimination in release with debuginfo builds exclude headers in builddir from -copy option more elegant treatment of qconfig.h special case simplify recursive symlinking
| * | | The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| * | | PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| * | | tst_qnetworkreply: Add testcase for unknown authentication methodMarkus Goetz2010-11-031-0/+32
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4121 Reviewed-by: ogoffart
| * | | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-032-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset authenticator and fix operator=(...) of QAuthenticator. Task-number: QTBUG-6792 Reviewed-by: ogoffart
| * | | msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that linker optimization is on by default in release builds, so override /DEBUG implicitly turning it off. as it happens, this implicitly disables incremental linking, so that option can go away now. Reviewed-by: joerg Task-number: QTBUG-14007
| * | | exclude headers in builddir from -copy optionOswald Buddenhagen2010-11-031-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: joerg
| * | | more elegant treatment of qconfig.h special caseOswald Buddenhagen2010-11-031-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of injecting it only if it is not there yet, exclude it if it is already there and then unconditionally inject it. this makes things more deterministic. Reviewed-by: joerg
| * | | simplify recursive symlinkingOswald Buddenhagen2010-11-021-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the jira issue itself has been already fixed, but in a somewhat arcane way. this one is better maintainable. Reviewed-by: joerg Task-number: QTBUG-14955
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-0310-50/+159
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
| * | | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-14979
| * | | Doc: style tuningMorten Engvoldsen2010-11-031-1/+1
| | | |
| * | | Doc: fixing style - tool buttons to bold.Morten Engvoldsen2010-11-031-1/+1
| | | |
| * | | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | | |
| * | | Doc: Fixing columns to display all elements in lists - css3Morten Engvoldsen2010-11-031-2/+2
| | | |
| * | | Doc: fixing bugs in styleMorten Engvoldsen2010-11-022-2/+7
| | | |
| * | | Doc: fixing style for search display and slim fit menusMorten Engvoldsen2010-11-021-3/+73
| | | |
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-0180-5677/+12165
| |\ \ \
| * | | | Doc: Fixing bug in sorting script for search results.Morten Engvoldsen2010-11-011-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-304-12/+53
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-29607-54610/+33052
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
| |\ \ \ \ \
| * | | | | | Doc: Fixed basic language.David Boddie2010-10-291-1/+1
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-27120-392/+824
| |\ \ \ \ \ \