summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
Commit message (Collapse)AuthorAgeFilesLines
* Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2011-06-271-0/+35
| | | | | | | | | | | Direct subclasses of QAbstractItemModel are unnaffected as they can update internal data in a slot connected to the sourceModel's modelReset signal or layoutChanged signal. Rehabilitated for 4.8. Should be reverted again in Qt 5. Reviewed-by: gabi Merge-request: 694
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-133-44/+44
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-261-35/+0
| | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier
* Merge branch 'master-upstream'Thierry Bastian2011-04-19157-2951/+5307
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07155-2951/+5175
| |\ | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-051-0/+24
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Handle the HTTP 418 reply properly in QNAM absorb translations.pri into translations.pro let generated flag control SQL generation Add version attributes as per ODF specification
| | | * Add branch prediction macrosAlberto Mardegan2011-04-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for Q_LIKELY and Q_UNLIKELY macros which instruct the compiler on which branch of an "if" statement is more likely to happen. The current patch only supports GCC's __builtin_expect(). Merge-request: 2580 Reviewed-by: ossi
| | * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-31154-2951/+5151
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| | | | * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | | | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
| | | * | | Doc: Fixed snippet documenting QMetaObject::classInfoThorbjørn Lindeijer2011-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can't use Q_OBJECT without inheriting from QObject. Reviewed-by: David Boddie
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-241-3/+4
| | | |\ \ \
| | | | * \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-3/+4
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| | | * | | | Doc: Fixed snippet bug in QPen class docsGeir Vattekar2011-02-241-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17556
| | | * | | Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13451
| | | * | | Doc: Fixed broken snippets.David Boddie2011-02-174-0/+322
| | | | | |
| | | * | | Doc: Fixed a example deployment script.David Boddie2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6467
| | | * | | Doc: Snippet quoting and other documentation fixes.David Boddie2011-02-091-76/+76
| | | | | |
| | | * | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-08148-2862/+4739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps them to be marked up correctly in cases where code markers are available.
| * | | | | network API: add support for HTTP multipart messagesPeter Hartmann2011-03-222-0/+132
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds two new classes, QHttpPart and QHttpMultiPart, and two new overloads to QNetworkAccessManager: post(const QNetworkRequest &request, QHttpMultiPart *multiPart) and put(const QNetworkRequest &request, QHttpMultiPart *multiPart). With those classes, it is possible to do a HTTP POST with a multipart message in a memory-saving way: The data from the parts is not copied when read from a file or another QIODevice. Reviewed-by: Markus Goetz Task-number: QTBUG-6222
* | | | | Fix licence headers again for MR 900Sergio Ahumada2011-04-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Gabriel de Dietrich
* | | | | Add the QIdentityProxyModel.Stephen Kelly2011-04-121-0/+66
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-171-3/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-171-3/+4
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3.sis from qt.sis.
| | * Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis
* | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-0/+12
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-31425-426/+426
| |\ \ \
| * | | | Add packagesExist() function to qmake.Robin Burchell2011-01-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-12/+12
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-071-1/+1
| | | |
| * | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | | |
| * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13425-425/+425
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| * | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-076-9/+73
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | | | doc: Removed an illegal char and some empty \row commands.Martin Smith2010-10-271-1/+1
| | | | |
| * | | | doc: Removed some illegal characters.Martin Smith2010-10-271-8/+8
| | | | |
| * | | | doc: Removed an illegal character.Martin Smith2010-10-271-1/+1
| | | | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17425-426/+426
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | | Update copyright year to 2011.Jason McDonald2011-01-10425-425/+425
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-3/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | Doc: Q_PROPERTY, implements the setter/getter in the exampleOlivier Goffart2010-11-221-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some developer thought the implementation of the getters and setters needed to have some metaobject magic Also add a NOTIFY signal in the example Reviewed-by: Joao
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-5/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * | Fix license text.Jason McDonald2010-11-171-5/+5
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-111-0/+16
| | | | | | | | | | | | Reviewed-by: trustme
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-091-0/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment for symbian/linux-armcc when using shadow builds. Started using qtmain.lib for all Qt applications, also corelib ones. Make qmake to pass all UTF-8 characters unchanged through parser. Implement support for DEPLOYMENT.display_name in Symbian Added .flags modifier support for DEPLOYMENT items in Symbian Make default application deployment removable Allow pkg_prerules and pkg_postrules to be targeted to separate files Added missing def file symbol. Revert "Use qtmain.lib to provide entry point for all Symbian applications" Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
| | * | Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default package name and the default name that appears in the application menu is derived from the TARGET variable. Often the default is not optimal for displaying to end user. To set a better display name for these purposes DEPLOYMENT.display_name variable can now be used. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf Task-number: QTBUG-15068 Task-number: QTBUG-14280 Reviewed-by: Janne Anttila
| | * | Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-11-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .flags modifier can be used to specify pkg flags for files. For example, to make default application run after install: default_bin_deployment.flags += FR RI For example, to show a note at installation time: notedep.sources = install_note.txt notedep.flags = FT TC DEPLOYMENT += notedep See Symbian package file format documentation for exact supported flag values. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: Janne Anttila
| | * | Make default application deployment removableMiikka Heikkinen2010-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
| | * | Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-11-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: a537137fffd72d153a35828228c00567a563e787 Task-number: QTBUG-15068 Task-number: QTBUG-13159 Reviewed-by: axis Conflicts: doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.qdoc
generated by cgit v0.12 at 2025-04-13 23:42:23 (GMT)