summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
* | #250741 Doc for Making task editablePeter Yard2009-07-241-1/+31
|/
* 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
|\
| * 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
* | 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
| / /