summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-233-3/+14
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix crash in indeterminate progressbars on windows Fix timer regression for indeterminate progressbars
| * Fix crash in indeterminate progressbars on windowsJens Bache-Wiig2010-12-223-3/+13
| | | | | | | | | | | | | | | | | | Note that this is a surgical fix for 4.7 only. In 4.8 we will add these checks at the top of the styling functions or in the widgets instead. Task-number:QTBUG-15227 Reviewed-by:gabi
| * Fix timer regression for indeterminate progressbarsJens Bache-Wiig2010-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Indeterminate progressbars were broken since 4.7.0 due to 0f771c62f5253a969f5a8a81bfd9254b9bd58b8f Since start was never called on QElapsedTimer, the elaped time was undefined and resulted in random repaints and behavior for indeterminate progressbars. Task-number:QTBUG-15227 Reviewed-by:richard
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-222-2/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix infinite loop in qmake when reading malformed .ts files. Fix libinfixed usage in Symbian when def files are used
| * | Fix infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | No checking for the end of xml file was done in while loop looking for TS element. Task-number: QTBUG-16261 Reviewed-by: Janne Koskinen
| * | Fix libinfixed usage in Symbian when def files are usedMiikka Heikkinen2010-12-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | There was a hardcoded lookup on "qtcore.dll" in s60main, which caused loading of wrong dll. Task-number: QTBUG-16221 Reviewed-by: Janne Koskinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-222-28/+109
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Made documentation of QPixmap::createMaskFromColor match behaviour. Improve performance of bilinear downscaling of images with neon.
| * | Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-16223 Reviewed-by: Gunnar Sletta
| * | Improve performance of bilinear downscaling of images with neon.Samuel Rødal2010-12-221-26/+107
| |/ | | | | | | | | | | | | Gives a 36 % performance boost for downscaling a 512x512 pixmap to 480x480 with SmoothPixmapFilter enabled. Reviewed-by: Andreas Kling
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-223-93/+107
|\ \ | |/ |/| | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Document the 'variant' basic type Add double type to QML Basic Types docs Remove redundant docs
| * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| | | | | | | | | | | | | | | | | | This includes documentation on restrictions and considerations when storing a JavaScript object with this type, since such properties only hold a copy of the object's values and not the actual object. Task-number: QTBUG-16196 Reviewed-by: Michael Brasser
| * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| |
| * Remove redundant docsBea Lam2010-12-221-81/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-2152-3464/+1943
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits) Doc: Added a missing license header. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example doc: Removed some empty \row commands from a table. Doc: Added link to QML Basic Types in main Qt Quick page. Doc: Added missing What's New information for Qt 4.6 and 4.7. Doc: Fixed incorrect case in a page file name. Doc: Added a link to the QML Basic Types page. Doc: Removed duplicate external page reference. Doc: Fixed a link to the correct searchPaths() function. Doc: Added documentation about the use of null custom title bar widgets. Doc: Added a missing external page reference. Fixed the QML Focus document. Fixed snippets, images, and formatting. Added QML coding convention for "private" properties. Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc. Some whitespace fixes. Fixed a bug by changing the id name to lower case. ...
| * Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-15105-3511/+2294
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1428-85/+286
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1342-157/+802
| | |\ \
| | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-82/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-138-2692/+768
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-1328-187/+345
| | |\ \ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-111-0/+7
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1016-174/+276
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0910-12/+61
| | | |\ \ \ \ \
| | * | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-336/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| * | | | | | | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Added at the request of Peter Hartmann and Legal.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-09293-3887/+9136
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-09995-21006/+43207
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0822-76/+314
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-088-24/+78
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-073-4/+18
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Added missing What's New information for Qt 4.6 and 4.7.David Boddie2010-12-072-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15670
| | | | * | | | | | | | Doc: Fixed incorrect case in a page file name.David Boddie2010-12-071-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Doc: Removed duplicate external page reference.David Boddie2010-12-071-5/+0
| | | | | | | | | | | |
| | | | * | | | | | | | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15516
| | | | * | | | | | | | Doc: Added a missing external page reference.David Boddie2010-12-071-0/+5
| | | | | | | | | | | |
| | | * | | | | | | | | Doc: Added link to QML Basic Types in main Qt Quick page.Jerome Pasion2010-12-081-0/+1
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-063-4/+18
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-06399-5118/+14799
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0617-219/+713
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * | | | | | | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
| | | | * | | | | | | | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
| | | | * | | | | | | | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
| | | | | | | | | | | |
| | | | * | | | | | | | Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-03108-2594/+4587
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-026-51/+87
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0115-79/+209
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-3060-341/+1663
| | | | |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-11-16 02:28:18 (GMT)