summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-25137-4616/+4735
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Added Windows Vista to the trademark list.David Boddie2010-10-221-3/+3
| | | | | | | | |
| * | | | | | | | Doc: Updated the Java trademark information.David Boddie2010-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checked with Legal.
| * | | | | | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the code showed how to use QDirModel and was included in the QDirModel class documentation, but it has since been changed to use QFileSystemModel instead.
| * | | | | | | | Doc: Corrected the name property as it was incorrectly declared.David Boddie2010-10-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-034-3/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Qt/Symbian: QInputDialog layout and size are wrong
| * | | | | | | | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QInputDialog with anything but QLineEdit as the input widget, will show up as minimal size on device/emulator. Also, the dialog looks bad since the widgets are deployed very close to the dialog borders. As a fix, layout will not get the size policy set on Symbian, but the dialog itself is stretched to occupy screen width and thus, layout grows to occupy the available size. Additionally, style will set layout pixel metrics for dialogs larger than for other widgets, to avoid the layout from putting widgets very close to dialog border. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-035-27/+43
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make the dtd reflect reality Fixed destination path for the S60 feedback plugin. german translation: minor additions + fixes fix qdoc doc generation
| * | | | | | | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| | | | | | | |
| * | | | | | | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| * | | | | | | german translation: minor additions + fixesFrederik Schwarzer2010-11-022-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 902 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs.
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| * | | | | | | QNAM HTTP: tst_qnetworkreply with setReadBufferSize() setDavid Faure2010-11-011-71/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new method tests 4 cases (http/https, with/without buffer size) and checks the send/receive rates to check that the actual transfer rate was limited, not just the speed of emission of data to the application. Task-number: QTBUG-6276 Merge-request: 872 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
| * | | | | | | Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "error: invalid pointer to bit-field `QAbstractStatePrivate::isMachine'" The extra qualification is not needed anyway, so remove it. Task-number: QTBUG-14491 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | | | | | Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| | | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-015-8/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | * | | | | | | Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10538 Reviewed-by: Trust Me
| | * | | | | | | Fix a few typos in comments and docs.Jason McDonald2010-11-014-4/+4
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13714 Reviewed-by: Trust Me
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-013-1/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Quickly clicking an item that doesn't use double clicking should result in two separate clicks
generated by cgit v0.12 at 2024-09-18 21:39:12 (GMT)