summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-293-3/+33
|\ | | | | | | | | | | | | | | | | | | 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
| * Doc: Replace more links to obsolete APIs.Volker Hilsheimer2009-07-251-1/+1
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Yard2009-07-243-1/+22
| |\
| | * Fixed embedded mouse and keyboard docu for 4.6Robert Griebl2009-07-231-1/+1
| | | | | | | | | | | | Reviewed-By: Paul
| * | #250741 Doc for Making task editablePeter Yard2009-07-241-1/+31
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-238-0/+341
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-238-0/+341
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| | * | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-222-0/+21
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
| | * Doc: Added info on QWrappedEvent to QAbstractTransition::eventTest()Geir Vattekar2009-07-171-0/+34
| | | | | | | | | | | | Reviewed-by: Kent Hansen
| | * Update the license headers in XML Schema to the new formatThiago Macieira2009-07-162-2/+2
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-153-7/+29
| | |\
| | * \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-05334-657/+1042
| | |\ \
| | * \ \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-163-1/+21
| | |\ \ \
| | * \ \ \ Merge commit 'qt-mainline/master'Tobias Koenig2009-06-0414-23/+156
| | |\ \ \ \
| | * | | | | Fixed typo in apidocs and extended example codeTobias Koenig2009-06-031-0/+23
| | | | | | |
| | * | | | | Added code snippets for QXmlSchemaValidator and referenced them from api docsTobias Koenig2009-05-213-0/+141
| | | | | | |
| | * | | | | Added code snippets for QXmlSchema and referenced them from api docsTobias Koenig2009-05-213-0/+122
| | | | | | |
* | | | | | | Move all QML types to Qt/4.6 namespace.Warwick Allison2009-07-2316-0/+32
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Adjust examples and demos accordingly. As per QT-558
* | | | | | Add FINAL attribute to Q_PROPERTY()Aaron Kennedy2009-07-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This will be used by the declarative module to optimize property bindings.
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-105-8/+39
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | | | | Updated docs to mention pattern matching in help project file lists.ck2009-07-071-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | | | general wording change for some file type namesFrederik Schwarzer2009-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | support for id-based translationsOswald Buddenhagen2009-07-061-0/+24
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlike in an earlier attempt, ids are textual this time. the developer is able to provide a template for the string. when lupdate and lrelease are integrated into the build process, this makes it possible to avoid a round-trip to a dedicated string designer during the early development stage. Requirement-id: QT-435
| * | | | Do not specify the output file when generating Visual Studio ProjectKeith Isdale2009-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files files with qmake. The correct file extension for generated file is best left to qmake to decide.
| * | | | add support for attaching meta data to translatable messagesOswald Buddenhagen2009-07-021-0/+9
| | | | | | | | | | | | | | | | | | | | Requirement: QT-457
* | | | | Add CONSTANT attribute to Q_PROPERTY()Aaron Kennedy2009-07-031-1/+2
| | | | | | | | | | | | | | | | | | | | This will be used by the declarative module to determine if a property lacking a NOTIFY signal is truly constant, or just missing a NOTIFY signal.
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-021-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-241-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-0/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-225-0/+294
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-181-0/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-17323-653/+653
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-161-1/+31
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp
| * | | | | | | | | | Merge of masterBradley T. Hughes2009-06-152-1/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * | | | | | | | | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-221-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-19330-653/+1020
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | | | | | | | | 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
| * | | | | | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16323-653/+653
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | Update license headers as requested by the marketing department.Jason McDonald2009-06-16323-652/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | doc: Added info on two ways to customize the style.Martin Smith2009-06-161-0/+30
| | |_|_|_|/ | |/| | | |
| * | | | | Added a code snippet for QProxyStyleJens Bache-Wiig2009-06-151-0/+15
| | | | | |
| * | | | | doc: Fixed several qdoc warnings.Martin Smith2009-06-121-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-111-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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