summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-06-264-16/+17
|\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/states/states.qml examples/declarative/states/transitions.qml examples/declarative/tutorials/helloworld/t3/tutorial3.qml src/declarative/util/qmlanimation.cpp
| * Color property is required to be explicity set (at least for now).Michael Brasser2009-06-262-3/+4
| |
| * Rename NumericAnimation -> NumberAnimationMichael Brasser2009-06-264-12/+12
| |
| * Rename VariantAnimation -> PropertyAnimation.Michael Brasser2009-06-251-1/+1
| |
* | Update SetProperties to handle changing bindingsAaron Kennedy2009-06-263-27/+8
|/ | | | Also removed all uses of SetProperty
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-249-3/+465
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-236-2/+390
| |\ | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | * Fix the dash pattern examples in the documentation of QPenBenjamin Poulain2009-06-231-2/+2
| | | | | | | | | | | | | | | The custom dash pattern must have an even number of entries. Our examples were using an odd number.
| | * Doc - Adding the new Frozen Column Example by Pierre Rossi into our list ofKavindra Devi Palaraja2009-06-231-0/+1
| | | | | | | | | | | | | | | | | | examples Reviewed-By: TrustMe
| | * Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-234-0/+387
| | | | | | | | | | | | Reviewed-By: TrustMe
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-223-1/+75
| | | | | | | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-222-1/+25
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | QNetworkDiskCache: add code snippets in documentationPeter Hartmann2009-06-221-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | should make it easier to apply a network disk cache with code snippets now Reviewed-by: David Boddie <dboddie@trolltech.com> Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
| * | Changed enum Qt::Uninitialized to enum Qt::InitializationMartin Smith2009-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enum Qt::Uninitialized contains one value, which is also called Uninitialized. Because the type and the value used the same name, wherever the type Qt::Uninitialized was used in a function signature, you had to include the enum keyword. But qdoc's preprocessor doesn't like that, so you have to take the enum keyword out of the signatures. But then the compiler complains because the type and the value look the same. So I had to change the enum type name to Initialization, so the compiler can distinguish it from the value name. And qdoc likes that too.
* | | Doc fixes.Michael Brasser2009-06-221-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-19773-1935/+2175
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-7/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| | * BT: Remove Intel CC 10 issue from known issues doc.Jason McDonald2009-06-171-7/+0
| | | | | | | | | | | | Acked-by: Andy Shaw
| * | Make construction of unitialized QTransform/QMatrix a no-op.Bjørn Erik Nilsen2009-06-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constructors are useful when you have to create a temporary uninitialized QTransform/QMatrix and later initialize it to something else. Done with Lars. Reviewed-by: samuel
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGeir Vattekar2009-06-181-0/+28
| |\ \
| | * | doc: Added explanation of QStringBuilder in QStringMartin Smith2009-06-181-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.
| * | | Doc: Added snippet files for state machine overview.Geir Vattekar2009-06-185-0/+294
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Doc: Removed mention of QItemAnimation from animation docs and setGeir Vattekar2009-06-181-6/+0
| |/ / | | | | | | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me
| * | Doc: Resolved merge conflict in state machine overviewGeir Vattekar2009-06-181-125/+16
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Update license headers in files that are new in 4.6.Jason McDonald2009-06-1711-22/+22
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Removed trailing whitespace.Bruno Abinader2009-06-165-116/+113
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
| * | Fixed small typo on the animation framework documentation.Bruno Abinader2009-06-161-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractClass is in fact QAbstractTransition, also added proper link to the addAnimation() method from that class. Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-16755-1551/+1551
| |\ \ | | |/
| | * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-167-13/+13
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16755-1538/+1538
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | doc: Added info on two ways to customize the style.Martin Smith2009-06-161-0/+30
| | |
| * | doc: Fixed several qdoc errors.Martin Smith2009-06-161-1/+1
| | |
| * | Added a code snippet for QProxyStyleJens Bache-Wiig2009-06-151-0/+15
| | |
| * | Sync application example documentation with actual examplemae2009-06-151-8/+8
| | | | | | | | | | | | | | | | | | The example now uses QPlainTextEdit instead of QTextEdit Reviewed-by: kavindra
| * | Fixed multiline doc for Qt::DropAction.Denis Dzyubenko2009-06-121-3/+3
| | |
| * | Removed \since 4.6 tag, mentioned that only the enum value is since 4.6Denis Dzyubenko2009-06-121-1/+1
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBjørn Erik Nilsen2009-06-122-41/+27
| |\ \
| | * | QHttp: Class made obsolete, changed module QDoc.Markus Goetz2009-06-121-40/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should better communicate that new applications should use QNetworkAccessManager. Reviewed-by: David Boddie
| | * | doc: Fixed several qdoc warnings.Martin Smith2009-06-121-1/+1
| | | |
| * | | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-122-50/+55
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * We do only support files inside or in subdirs of the help project.kh2009-06-111-45/+50
| | | | | | | | | | | | | | | Task-number: 255888 Reviewed-by: kh
| | * Doc - fixed a typoKavindra Devi Palaraja2009-06-081-5/+5
| | | | | | | | | | | | Reviewed-By: TrustMe
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-121-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/gui/painting/qdrawutil.cpp
| * | doc: Fixed several qdoc warnings.Martin Smith2009-06-121-4/+7
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-115-15/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicswidget.cpp src/gui/painting/qdrawutil.cpp src/gui/painting/qpainterpath.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | Doc: Make it easier to find supported platform information from theDavid Boddie2009-06-111-0/+3
| | | | | | | | | | | | | | | | | | installation page. Reviewed-by: Trust Me
| * | Doc: Added information about QDBUS_DEBUG to the D-Bus documentation.David Boddie2009-06-112-1/+23
| | | | | | | | | | | | | | | Task-number: 253715 Reviewed-by: Trust Me
| * | Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-4/+0
| | | | | | | | | | | | Reviewed By: andy
| * | Some adjustments to the documentationJens Bache-Wiig2009-06-101-10/+10
| | | | | | | | | | | | | | | Headers are slightly lighter now. Not all tables are affected by the changes any more.
* | | qdoc: Mention that QML_DECLARE_TYPE only works for non-abstract classesKai Koehne2009-06-111-1/+2
| | |