summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-116-10/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix loading of module configs don't load modules from qt.prf add comment explaining why this file does magic instead of just voodoo configure.exe: don't write the QT_NAMESPACE define to .qmake.cache Don't build bearercloud example if Qt was build w/o SVG support
| | * | | | | fix loading of module configsOswald Buddenhagen2010-08-114-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
| | * | | | | don't load modules from qt.prfOswald Buddenhagen2010-08-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are already loaded in qconfig.pri, which is loaded from qt_config.prf, which is explicitly loaded by every qmake spec. Reviewed-by: Simon Hausmann Reviewed-by: joerg
| | * | | | | add comment explaining why this file does magic instead of just voodooOswald Buddenhagen2010-08-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg Reviewed-by: Simon Hausmann
| | * | | | | configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-1113-37/+51
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix cppextension examples. Compile on Symbian Don't destroy ListModel child list nodes.
| | * | | | | | Fix cppextension examples.Martin Jones2010-08-1110-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a useful message on error. Specify the QML url correctly.
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-11108-4862/+10509
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-113-14/+32
| | | |\ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't destroy ListModel child list nodes.
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-10108-4862/+10509
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix memory leak in QtScript variable object doc: Changed some titles so lists of contents sort better. QSslSocket: fix security vulnerability with wildcard IP addresses doc: Some reorganization of top page topic hierarchy. Mac: Fix crash when using style to draw on other things than widgets Doc: Adding radius support for CSS3 and webkit Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. ...
| | | * | | | | | | Compile on SymbianMartin Jones2010-08-112-14/+10
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12771
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-1128-64/+156
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | | * | | | | | Don't destroy ListModel child list nodes.Martin Jones2010-08-113-14/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are owned by the root and must not be destroyed by child lists. Task-number: QTBUG-12771 Reviewed-by: Bea Lam
* | | | | | | | | qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-118-24/+113
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Don't build bearercloud example if Qt was build w/o SVG supportAlex2010-08-111-1/+4
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12791 Reviewed-by: David Laing
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-10108-4862/+10509
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix memory leak in QtScript variable object doc: Changed some titles so lists of contents sort better. QSslSocket: fix security vulnerability with wildcard IP addresses doc: Some reorganization of top page topic hierarchy. Mac: Fix crash when using style to draw on other things than widgets Doc: Adding radius support for CSS3 and webkit Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. ...
| * | | | | | Fix memory leak in QtScript variable objectKent Hansen2010-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The d-pointer is of type JSVariableObjectData*, but JSVariableObjectData doesn't have a virtual destructor. Hence we must cast the d-pointer to our subclass when deleting. In particular, this will ensure that the destructor of the symbolTable member is called, which will deallocate the table storage. (For QScriptActivationObject this did not cause a leak in practice, because its symbolTable is always empty, and JSC's hash table uses lazy allocation.) Task-number: QTBUG-12479 Reviewed-by: Olivier Goffart
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+7
| |\ \ \ \ \ \
| | * | | | | | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704
| * | | | | | | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-1014-23/+24
| |/ / / / / /
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+19
| |\ \ \ \ \ \
| | * | | | | | Mac: Fix crash when using style to draw on other things than widgetsRichard Moe Gustavsen2010-08-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When drawing a complex control using the style, you are allowd to skip giving a widget as the last argument. But when doing so, it caused a crash in the mac style. Reviewed-by: Fabien Freling
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-1025-61/+127
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Adding radius support for CSS3 and webkitMorten Engvoldsen2010-08-101-0/+16
| | | | | | | | |
| * | | | | | | | doc: Some reorganization of top page topic hierarchy.Martin Smith2010-08-107-18/+17
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1083-4819/+10440
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. doc: Fixed some qdoc errors. Add Ukrainian translation. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. ...
| | * | | | | | Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regressionBradley T. Hughes2010-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit eea84818e98af917d3cf2bf04ea17a416ef9d55e corrected some spelling mistakes, one of which this test was relying on. Reviewed-by: trustme
| | * | | | | | add performance comparisons to qregexp benchmarkArvid Ephraim Picciani2010-08-103-1/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
| | * | | | | | configure: fix error message when calling config.statusJoerg Bornemann2010-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling configure in a shadow build directory led to error messages when trying to delete the content of $$QT_BUILD_TREE/mkspecs. Task-number: QTBUG-12764 Reviewed-by: ossi
generated by cgit v0.12 at 2025-08-16 03:56:08 (GMT)