summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/2379' of git://gitorious.org/qt/qt into ↵David Boddie2010-05-041-0/+20
|\ | | | | | | integration
| * Add diagrams for illustrating the process of moving rows.Stephen Kelly2010-05-031-0/+20
| |
* | Symbian (installation) docs.Thomas Zander2010-04-291-2/+84
| | | | | | | | Done with: Axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ...
| * | Ensure workerscript.qml works (autotested).Warwick Allison2010-04-211-0/+1
| |/
* | Trivial doc fixHarald Fernengel2010-04-211-0/+1
|/ | | | | The docs for qDBusRegisterMetaType did not mention the required header at all, since the function is documented as part of QDBusArgument.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-171-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: EABI and BWINS DEF file updates for Symbian Further RVCT4 fixes for Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Fixed automatic patching of self-signed packages Webkit got bigger, make it link again on armlink Set library path properly for all systems Make debugging floating point mistakes much easier. Simplify docs a bit Fix check for arm based systems Fix option(recursive)
| * Simplify docs a bitThomas Zander2010-04-161-2/+0
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-1/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtGuiu.def tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
| * DocAaron Kennedy2010-04-161-1/+4
| | | | | | | | | | Update QObject documentation to match the Qt's Property System documentation.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * | A bit saner suggestionThomas Zander2010-04-121-1/+1
| | | | | | | | | | | | | | | The docs should probably not suggest a permission level has so many permissions that in practice nobody needs it (or can get it)
* | | import Qt 4.6 -> import Qt 4.7Yann Bodson2010-04-1222-22/+22
| | |
* | | Move documentation code to snippet.Yann Bodson2010-04-121-0/+24
| | |
* | | coding conventionsYann Bodson2010-04-121-16/+14
| | |
* | | doc fixesYann Bodson2010-04-121-1/+1
| | |
* | | Start documenting coding conventionsYann Bodson2010-04-126-0/+136
| | | | | | | | | | | | Task-number: QT-2845
* | | Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-081-1/+1
|/ /
* | Doc: update the QDBusPendingCallWatcher example to show where to deleteThiago Macieira2010-04-061-0/+1
| | | | | | | | Task-number: QTBUG-8865
* | Improve flipable example.Yann Bodson2010-03-311-0/+37
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-254-2/+125
|\ \ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * | Rename networkAccess property to networkAccessible.Aaron McCarthy2010-03-191-0/+9
| | | | | | | | | | | | Add unit test and update docs.
| * | doc: Fixed use of Qt 3 support function in QIcon doc snippetThorbjørn Lindeijer2010-03-181-2/+2
| | | | | | | | | | | | | | | isOn() is an Qt 3 support member of QAbstractButton, isChecked() should be used instead.
| * | Doc: document QElapsedTimerThiago Macieira2010-03-172-0/+114
| | | | | | | | | | | | Task-Number: QT-2965
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-3/+8
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Clarified pkg_prerules usage documentation.Miikka Heikkinen2010-03-242-3/+8
| | | | | | | | | | | | | | The default_deployment item shouldn't be used to add own rules. Task-number: QTBUG-9277 Reviewed-by: Janne Anttila
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-0/+5
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Support for adding user specified list type content in rss fileMiikka Heikkinen2010-03-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the following RSS_RULES variables to improve control over placement of user defined rules inside application registration resource file: RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item in the service_list of APP_REGISTRATION_INFO RSS_RULES.file_ownership_list - Rule placed inside a FILE_OWNERSHIP_INFO item in the file_ownership_list of APP_REGISTRATION_INFO RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the datatype_list of APP_REGISTRATION_INFO Task-number: QT-3083 Reviewed-by: Janne Anttila
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-0/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Added .condition modifier to SUBDIRS.Miikka Heikkinen2010-03-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, it is now possible to set certain subdirs to be built only when specified define is true when bld.inf is parsed. For example, compile a subdir only when building for emulator: SUBDIRS += winscw_lib winscw_lib.condition = WINSCW Also improved SUBDIRS variable documentation; the modifiers were completely undocumented. Task-number: QT-3017 Reviewed-by: axis
* | Update QML documentation snippets to latest syntax.Aaron Kennedy2010-03-056-29/+5
| |
* | Updating documentation for how to build QWS with tslibJørgen Lind2010-03-031-1/+4
| | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* | QMetaType: Now we can register typedefs.Olivier Goffart2010-03-021-0/+5
| | | | | | | | | | | | | | Task-number: QTBUG-6833 Task-number: QTBUG-937 Reviewed-by: Brad Reviewed-by: Kent Hansen
* | Merge branch '4.6'Miikka Heikkinen2010-02-261-0/+13
|\ \ | |/ | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * Added addMMPRules for adding conditional MMP_RULESMiikka Heikkinen2010-02-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: # Set conditional libraries LIB.MARM = "LIBRARY myarm.lib" LIB.WINSCW = "LIBRARY mywinscw.lib" LIB.default = "LIBRARY mydefault.lib" # Set conditional Epoc Heap Size EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000" EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000" # Add the conditional MMP rules MYCONDITIONS = MARM WINSCW MYVARIABLES = LIB EHZ addMMPRules(MYCONDITIONS, MYVARIABLES) This will generate the following in the mmp file: #if defined(MARM) LIBRARY myarm.lib EPOCHEAPSIZE 0x40000 0x400000 #elif defined(WINSCW) LIBRARY mywinscw.lib EPOCHEAPSIZE 0x2000 0x2000000 #else LIBRARY mydefault.lib EPOCHEAPSIZE 0x40000 0x400000 #endif Task-number: QT-2909 Reviewed-by: axis
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-1/+1
|\ \ | |/ | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.Martin Smith2010-02-231-1/+1
| | | | | | | | Task: QTBUG-7766
* | Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-232-3/+3
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-222-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| | * | Rename MouseRegion -> MouseAreaMartin Jones2010-02-222-3/+3
| | | |
* | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-222-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * | | Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-202-2/+2
| |/ /
* | | Use snippets.Aaron McCarthy2010-02-151-0/+49
| | |
* | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-0/+9
|/ /
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1321-0/+468
|\ \ | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1021-0/+468
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-0521-0/+468
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| | | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-0421-0/+468
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-032-4/+19
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-022-4/+19
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp