summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| | | | Task-number: QTBUG-12285
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-128-31/+30
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Destroy the old runtime system only when existing pixmaps were migrated. Fixed autotest failure in tst_qgl::clipTest. Added way to destroy the share widget in the GL graphics system. qdoc: All references to -assistant and -base were removed.
| * Destroy the old runtime system only when existing pixmaps were migrated.Michael Dominic K2010-08-121-1/+3
| | | | | | | | | | Merge-request: 2448 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Fixed autotest failure in tst_qgl::clipTest.Samuel Rødal2010-08-121-0/+1
| | | | | | | | | | | | | | | | | | Change fb00d5003ac5d91953a95d8164180f8f56a2b0f2 introduced a slight behavioural change by leaving the surface handle dangling. We need to unset the surface handle even if we don't own it to make sure we don't access it again. Reviewed-by: Gunnar Sletta
| * Added way to destroy the share widget in the GL graphics system.Samuel Rødal2010-08-122-0/+20
| | | | | | | | | | | | | | This lets us destroy the share widget temporarily if we want to free up OpenGL resources for a while. Reviewed-by: Gunnar Sletta
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1297-8890/+4952
| |\
| * | qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-124-30/+6
| | | | | | | | | | | | | | | Flags allowed are now -creator and -online. -creator is the default.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-1210-46/+189
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed build failure Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| * | Fixed build failureGareth Stockwell2010-08-123-4/+4
| | | | | | | | | | | | Task-number: QTBUG-12713
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-129-46/+189
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-119-46/+189
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| | | * | Added documentation for Spectrum Analyzer demoGareth Stockwell2010-08-113-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12720 Reviewed-by: David Boddie
| | | * | Do not include Spectrum Analyzer demo in static buildsGareth Stockwell2010-08-112-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This demo includes a 3rd party library which is licensed under the LGPL. As such, the demo application may only link to the library dynamically. Task-number: QTBUG-12713 Reviewed-by: Justin McPherson
| | | * | Gcce building support for symbian-sbsv2Miikka Heikkinen2010-08-114-41/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1232-8750/+3254
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1132-8750/+3254
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| | * | | Fix some #ifdefs to compile for a specific combination of featuress that was ↵Trever Fischer2010-08-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously unsupported Merge-request: 2444 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | update Russian translations for Qt and toolsRitt Konstantin2010-08-118-4911/+305
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2445 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Updated Slovenian translations for Qt 4.7Jure Repinc2010-08-112-3662/+2478
| | | |/ | | |/| | | | | | | | | | | | | Merge-request: 771 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1112-150/+347
| | |\ \
| | | * | 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256Andreas Kling2010-08-111-73/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected and enabled the 64-bit versions of these three functions. Speed improvements (tested on an i7): BYTE_MUL : 104.7% INTERPOLATE_PIXEL_256 : 13.2% PREMUL : 13.1% Reviewed-by: Samuel Rødal
| | | * | QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2010-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-12259
| | | * | QSslCertificate: support expiration dates > 2049Peter Hartmann2010-08-113-50/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X509 has two time formats: UTC, where the year is in two-digit format, and generalized time with four-digit years. This patch allows dates specified generalized time. Reviewed-by: Thiago Macieira Task-number: QTBUG-12489
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-11245-9474/+18075
| | | |\ \
| | | | * | Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| | | | | |
| | | | * | Doc: Fixing bug involving header misplacement in Creator styleMorten Engvoldsen2010-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11408
| | | * | | qdoc: Ensured that text is encoded correctly.David Boddie2010-08-101-9/+9
| | | | | |
| | | * | | qdoc: Fixed non-well-formed markup.David Boddie2010-08-092-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-really-reviewed-by: Qt Doc Team
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0585-348/+2415
| | | |\ \ \
| | | * \ \ \ Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into ↵David Boddie2010-08-052-5/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | integration
| | | | * | | | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-07-271-1/+1
| | | | | | | |
| | | | * | | | Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-07-271-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it.
| | | * | | | | Doc: Fixed typo in a shortcut string.David Boddie2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Task-number: QTBUG-12355
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-04909-8752/+29584
| | | |\ \ \ \ \
| | | * | | | | | Doc: Added more license information.David Boddie2010-07-162-8/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3585 Reviewed-by: Trust Me
| | * | | | | | | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-112-3/+5
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Either someone removed the QML: prefix, or it was never there.
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1118-46/+55
| | |\ \ \ \ \ \
| | * | | | | | | qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-118-24/+113
| | | | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-123-6/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Only modify pixmap cache reply when protected by a mutex Fix broken example code
| * | | | | | | | | Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-122-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-12729
| * | | | | | | | | Fix broken example codeBea Lam2010-08-121-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12839
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1267-279/+1688
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (31 commits) Fix typos in docs Layout items had the wrong size if the layout was resized to maximum. Disable minRightBearing optimization in QTextLayout on Mac Added one test for QRegExp QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. Fix (implement!) hfw/wfh in QGridLayoutEngine Fixed a bug in implementation of sizeHint() when there was a constraint Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff ...
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-08-1120-50/+62
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix typos in docsThomas Zander2010-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1159-238/+983
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Disable minRightBearing optimization in QTextLayout on Mac Added one test for QRegExp QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" ...
| * | | | | | | | | | Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-117-19/+682
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-105-17/+678
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that only height-for-width works, since we cannot add QSizePolicy::hasWidthForHeight() in a patch release. Task-number: QT-3570 Reviewed-by: Paul
| | * | | | | | | | | | Fixed a bug in implementation of sizeHint() when there was a constraintJan-Arve Sæther2010-08-102-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constraint was not adjusted with the margins before passing it on to the engine (which is unaware of the margins). Task-number: Found during QT-3570 Reviewed-by: Paul
| * | | | | | | | | | | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-112-19/+20
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that if targetSize was the layouts maximum size, then sumAvailable could be reduced to exactly 0 in the "while (keepGoing)" loop. That would mean that we would not enter the block that actually copied the new sizes from the temporary "newSizes" array to the output "sizes" array due to the "if (sumAvailable > 0)" condition. Task-number: none, discovered while fixing QT-3570 Reviewed-by: Frederik Gladhorn
| * | | | | | | | | | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither of the Mac font engines have implemented minimum right bearing, which will cause them to return 0 for the minimum value. This will cause the right bearing to never be calculated prior to breaking and thus never be a part of the breaking width. Since actually implementing the functions is too time consuming for right now, we will disable the optimization for the time being. Reviewed-by: Olivier
generated by cgit v0.12 at 2025-08-26 03:40:31 (GMT)