summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-05334-657/+1042
|\
| * 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
| * 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 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/qtBradley T. Hughes2009-06-231-0/+24
| |\ \ \ | | |/ /
| | * | 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/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/qtGeir Vattekar2009-06-181-0/+28
| | |\ \
| | * | | Doc: Added snippet files for state machine overview.Geir Vattekar2009-06-185-0/+294
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | 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
| | * | | 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.
| * | | 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 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
| * | | 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
| | * | doc: Added info on two ways to customize the style.Martin Smith2009-06-161-0/+30
| | | |
| * | | Merge of masterBradley T. Hughes2009-06-152-1/+16
| | | |
* | | | Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-163-1/+21
|\ \ \ \ | | |/ / | |/| |
| * | | Added a code snippet for QProxyStyleJens Bache-Wiig2009-06-151-0/+15
| | | |
| * | | doc: Fixed several qdoc warnings.Martin Smith2009-06-121-1/+1
| |/ /
| * | Doc: Added information about QDBUS_DEBUG to the D-Bus documentation.David Boddie2009-06-111-0/+5
| | | | | | | | | | | | | | | Task-number: 253715 Reviewed-by: Trust Me
* | | Merge commit 'qt-mainline/master'Tobias Koenig2009-06-0414-23/+156
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-272-2/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * Doc: Fixed custom graphics item snippet.David Boddie2009-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | As reported on qt-interest: http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html Reviewed-by: Trust Me
| | * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-226-20/+65
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| | * | Doc: First attempt at a simpler widgets tutorial.David Boddie2009-05-201-0/+14
| | | | | | | | | | | | | | | | | | | | Task-number: 253710 Reviewed-by: Trust Me
| | * | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-2/+4
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| | | * Cleaning bug in custom layout example.Morten Engvoldsen2009-05-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Menard2009-05-181-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
| | * | Merge branch '4.5'Thiago Macieira2009-05-141-18/+23
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| | | * Correcting bug in cardLayout exampleMorten Engvoldsen2009-05-131-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the count() function to the example. Task-number: 220766 Rev-by: Geir Vattekar
| | * | Merge commit 'origin/4.5'Olivier Goffart2009-05-131-1/+1
| | |\ \ | | | |/
| * | | Doc: Added a small example/test case for sequential animations.David Boddie2009-05-207-0/+108
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1220-141/+72
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | Correcting bug in custom Database Driver code snipptetMorten Engvoldsen2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding const to call. Changing QSqlRecord record() { return QSqlRecord(); } to QSqlRecord record() const { return QSqlRecord(); } This is needed since record() is a virtual function. Task-number:204557 Rev-by: Geir Vattekar
| * | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171026-0/+64548
| / /
* | | 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
| |/ |/|
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-0/+1
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Doc: Added info on NOTIFY to the Q_PROPERTY docs.Geir Vattekar2009-05-061-0/+1
| | | | | | | | Task-number: 248336
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-246-166/+0
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-246-166/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| * Fix my previous commit since I missed the q out of qtestlibAndy Shaw2009-04-221-1/+1
| | | | | | | | | | Task-number: 251848 Reviewed-by: TrustMe
| * Fix the code snippet for executing a test, it should be CONFIG not QTAndy Shaw2009-04-221-1/+1
| | | | | | | | | | Task-number: 251848 Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-11-11 08:20:38 (GMT)