summaryrefslogtreecommitdiffstats
path: root/doc/src/images
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-291-0/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/widgets/qlineedit.cpp
| * Move sub-attaq from examples to demos because sub-attaq is a bitAlexis Menard2009-07-281-0/+0
| | | | | | | | too "advanced".
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-2346-0/+0
|\ \ | |/ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * Doc fixes to QEasingCurve.Jan-Arve Sæther2009-07-2145-0/+0
| | | | | | | | | | | | | | | | | | | | | | * Remove some references to QAnimation. QAnimation does not exist. * Clarify the documentation for QEasingCurve::Linear. (avoid "tweening" and "no easing") * In the diagrams, change "ease" to "value". * Change the diagram generation code to use antialiased drawing (just as we do in the easingcurve example) Reviewed-by: leo
| * Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-056-0/+0
| |\
| * \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-101-0/+0
| |\ \
| * \ \ Merge commit 'qt-mainline/master'Tobias Koenig2009-06-0476-0/+0
| |\ \ \
| * | | | First version of documentation for schema exampleTobias Koenig2009-05-191-0/+0
| | | | |
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-024-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * | | | Doc: Documented the Move Blocks example.Geir Vattekar2009-06-292-0/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen
| * | | | Doc - Improved the Detailed Description section for QCheckBox withKavindra Devi Palaraja2009-06-292-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screenshots and some cleaned up sentences. Reviewed-By: TrustMe Details: Also fixed the error in the sentence mentioning that QButtonGroup can be used to group buttons visually thanks to a bug report.
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-242-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * | | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-232-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | * | | Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-232-0/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-091-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | | | Doc: Added information about the Fontconfig and FreeType dependencies.David Boddie2009-06-081-0/+0
| | |_|/ | |/| | | | | | | | | | | | | | Task-number: 250349 Reviewed-by: Trust Me
* | | | Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-041-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp
| * | | Merge branch '4.5'Denis Dzyubenko2009-06-021-0/+0
| |\ \ \ | | |/ /
| | * | Doc - changing the "main layout" term to "top level widget's layout" toKavindra Devi Palaraja2009-06-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve some consistency. Also added a screenshot of the Object Insepector displaying a form where its widget has no top level layout. Reviewed-By: TrustMe
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-291-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/doc.cpp
| * | | Merge branch '4.5'Tom Cooksey2009-05-281-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| | * | Doc - final screenshot and changesKavindra Devi Palaraja2009-05-281-0/+0
| | | |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-2715-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-2710-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * | Doc - more images and additional descriptionKavindra Devi Palaraja2009-05-265-0/+0
| | | |
| | * | Doc - more screenshots and better descriptionKavindra Devi Palaraja2009-05-263-0/+0
| | | |
| | * | Doc - more screenshots and adding better descriptionKavindra Devi Palaraja2009-05-262-0/+0
| | | | | | | | | | | | | | | | Details: Work in progress
| * | | Merge branch '4.5'Thiago Macieira2009-05-221-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
| | * | Doc - updating the screenshotKavindra Devi Palaraja2009-05-221-0/+0
| | |/ | | | | | | | | | Reviewed-By: TrustMe
| * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-191-0/+0
| |\ \
| * | | doc: Minor fixes + update UML diagrams for stick man exampleEskil Abrahamsen Blomfeldt2009-05-183-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Using StarUML this time, since there were "unregistered version" watermarks on the Enterprise Architect ones. Not as nice, but it's impossible to find a free UML tool which produces nice diagrams.
| * | | doc: New state chart diagrams for Stickman exampleEskil Abrahamsen Blomfeldt2009-05-153-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | These obviously cannot be used, since they have the "unregistered version" watermark on them. Didn't notice before now, so I might as well commit them for the time being.
| * | | Remove the connectByAnimation() function and add some documentation for the ↵Eskil Abrahamsen Blomfeldt2009-05-142-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Stickman example The connectByAnimation() function is no longer needed since we have default animations. The docs are unfinished.
* | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-1814-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 Vattekar2009-05-151-0/+0
| |/ / | | | | | | | | | Reviewed-by: David Boddie
| * | more statemachine docsKent Hansen2009-05-131-0/+0
| | |
| * | doc: Add screenshot for Tank Game ExampleEskil Abrahamsen Blomfeldt2009-05-131-0/+0
| | |
| * | document statemachine/factorial exampleKent Hansen2009-05-131-0/+0
| | |
| * | document the statemachine/pingpong exampleKent Hansen2009-05-121-0/+0
| | |
| * | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-129-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | improve the docs for the trafficlight exampleKent Hansen2009-05-122-0/+0
| | | |
| | * | redo statecharts in proper UML notation, expand documentationKent Hansen2009-05-127-0/+0
| | | |
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-176-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-171334-0/+1
| | / / | | | | | | | | | | | | repository to the new repository
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1210-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171334-0/+1
| / /
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-063-0/+0
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Use animated images where appropriate.Ian Walters2009-05-063-0/+0
| | | |
* | | | white background no good in web page, go grayWarwick Allison2009-05-063-0/+0
|/ / /
* | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-061-0/+0
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
generated by cgit v0.12 at 2024-09-26 23:20:17 (GMT)