Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | correct path doc | Warwick Allison | 2009-05-25 | 1 | -3/+0 |
| | |||||
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-22 | 37 | -114/+537 |
|\ | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h | ||||
| * | Sync the French addressbook tutorial with the English version | Benjamin Poulain | 2009-05-20 | 1 | -2/+5 |
| | | | | | | | | Reviewed-by: Thierry | ||||
| * | Changing the addressbook tutorial so it doesn't leak. | Daniel Molkentin | 2009-05-20 | 1 | -3/+6 |
| | | | | | | | | Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com> | ||||
| * | Merge branch '4.5' of ../qt-45-documentation | David Boddie | 2009-05-20 | 3 | -55/+344 |
| |\ | |||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-20 | 2 | -1/+262 |
| | |\ | |||||
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Martin Smith | 2009-05-20 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Fix incorrect copyright year in some license headers. | Jason McDonald | 2009-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | | qdoc: Moved qdoc comments from qmacstyle_mac.mm to qstyles.qdoc | Martin Smith | 2009-05-20 | 1 | -0/+261 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .mm file is not read by qdoc for packages other than for the MAC. This problem is overcome by moving the qdoc comments from the .mm file to a .qdoc file in doc/src, because all these files are read by qdoc for each of the packages. #Task-number: 252566 | ||||
| | * | | Doc: Added information about the third-party MD4, SHA-1 and DES code. | David Boddie | 2009-05-19 | 1 | -54/+82 |
| | |/ | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | Doc: First attempt at a simpler widgets tutorial. | David Boddie | 2009-05-20 | 2 | -11/+135 |
| | | | | | | | | | | | | | | | Task-number: 253710 Reviewed-by: Trust Me | ||||
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-19 | 2 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | qdoc: Corrected a misspelled name. | Martin Smith | 2009-05-19 | 1 | -1/+1 |
| | | | |||||
| | * | qdoc: Corrected an escape sequence in the credits file. | Martin Smith | 2009-05-19 | 1 | -1/+1 |
| | | | |||||
| | * | Replace all occurences of "heirarchy" with "hierarchy" | Andre Haupt | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Signed-off-by: Andre Haupt <andre@bitwigglers.org> Reviewed-By: Thiago Macieira | ||||
| | * | Fix some typos in the documentation. | Frederik Schwarzer | 2009-05-18 | 24 | -29/+29 |
| | | | | | | | | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira | ||||
| * | | Merged branch 'master' of git://gitorious.org/~icwiener/qt/icwieners-clone.git | Tor Arne Vestbø | 2009-05-18 | 24 | -29/+29 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frederik Schwarzer (1): typos in docs: double "the" Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/362 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | ||||
| | * | | typos in docs: double "the" | Frederik Schwarzer | 2009-05-11 | 24 | -29/+29 |
| | | | | |||||
| * | | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-05-18 | 5 | -10/+14 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp | ||||
| | * | | Adding change details in to Qt 3 to Qt 4 porting guide | Morten Engvoldsen | 2009-05-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding details about QCloseEvents being acceptet by default in Qt 4 opposed to Qt 3 Task-number: 192607 Rev-by: msorvig | ||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Andy Shaw | 2009-05-18 | 1 | -4/+0 |
| | |\ \ | |||||
| | | * | | QCss: font-family handle fallback font specs | Olivier Goffart | 2009-05-18 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if one specify more than one parameter in font-family, e.g., font-family: Verdana, Arial Qt should fallback on the second font if the first cannot be found. QFont::setFamily handle the case when the family name contains a comas, so we do not need to handle that specially in the css parser code. Task-number: 252311 Reviewed-by: Thomas Zander | ||||
| | * | | | Fix incorrect signal referred to in the docs | Andy Shaw | 2009-05-18 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the documentation to state sortIndicatorChanged() should be used and not sectionClicked() for connecting to the sortByColumn() slot as the sortByColumn() takes two parameters, not one. Reviewed-by: Kavindra Palaraja | ||||
| | * | | Cleaning bug in custom layout example. | Morten Engvoldsen | 2009-05-15 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one. Task-number: 220656 Rev-by: janarve | ||||
| * | | | Add an extension to QPixmapCache to get rid of strings. | Alexis Menard | 2009-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a new API to add/find/remove pixmaps into QPixmapCache. This new extension is based on a key that the cache give you during the insertion. This key is internally a int which makes all operations in the cache much more faster that the string approach. Auto-tests has been extended as well and a benchmark has been added to compare both approach. I also depecrate the find method for the string API to have a method pointer based and not reference based like the Qt policy says. Reviewed-by: bnilsen Reviewed-by: andreas Followed-deeply-by: trond | ||||
* | | | | Fix docs. | Michael Brasser | 2009-05-19 | 1 | -2/+4 |
| | | | | |||||
* | | | | Docs and minor fixes for the Rotation element. | Michael Brasser | 2009-05-19 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-05-18 | 26 | -56/+1334 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | | | | Doc: Added architecture image to animation overview. | Geir Vattekar | 2009-05-15 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| * | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-15 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * \ \ \ | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-14 | 2 | -9/+9 |
| | |\ \ \ \ | |||||
| | * | | | | | Pop up message when a tank wins the game | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed: Added some docs and moved the tanks a little so they don't start partly outside the scene rect. | ||||
| * | | | | | | Doc: Added a work in progress class hierarchy overview. | David Boddie | 2009-05-15 | 1 | -0/+351 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar | ||||
| * | | | | | Doc: Marked up a link correctly. | David Boddie | 2009-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
| * | | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-13 | 7 | -5/+259 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | | more statemachine docs | Kent Hansen | 2009-05-13 | 2 | -5/+40 |
| | | | | | | |||||
| | * | | | | doc: Add screenshot for Tank Game Example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 1 | -0/+0 |
| | | | | | | |||||
| | * | | | | document statemachine/factorial example | Kent Hansen | 2009-05-13 | 3 | -0/+103 |
| | | | | | | |||||
| | * | | | | doc: Correct names of snippets in docs for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | doc: Add documentation for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 2 | -0/+116 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-12 | 47 | -386/+1001 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | | document the statemachine/eventtransitions example | Kent Hansen | 2009-05-12 | 2 | -2/+89 |
| | | | | | | |||||
| | * | | | | add State Machine to examples overview | Kent Hansen | 2009-05-12 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | Fixes: document statemachine/twowaybutton example | Kent Hansen | 2009-05-12 | 2 | -0/+83 |
| | | | | | | |||||
| | * | | | | document the statemachine/pingpong example | Kent Hansen | 2009-05-12 | 3 | -0/+108 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Alexis Menard | 2009-05-12 | 11 | -56/+435 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | | * | | | | doc: Add documentation for animations, restore policy and polished signal | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -0/+182 |
| | | | | | | | |||||
| | | * | | | | update license headers | Kent Hansen | 2009-05-12 | 2 | -6/+66 |
| | | | | | | | |||||
| | | * | | | | improve the docs for the trafficlight example | Kent Hansen | 2009-05-12 | 3 | -16/+27 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 1 | -0/+1 |
| | | |\ \ \ \ |