summaryrefslogtreecommitdiff
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-261-2/+2
|\ \ \
| * | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-211-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
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | | |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-255-9/+145
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | Fix Flipable docsBea Lam2010-10-221-8/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-13789
| * | | Fix autotest failure caused by commit 92365268Jason McDonald2010-10-152-2/+2
| | |/ | |/|
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-061-7/+7
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-04128-129/+136
| |\ \ \
| * | | | Doc: Made a number of fixes to the documentation.David Boddie2010-10-042-1/+11
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-301-0/+93
| |\ \ \ \
| | * | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-20125-125/+407
| |\ \ \ \ \
| * | | | | | Doc: More work on QML reference documentation.David Boddie2010-09-172-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-191-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. Reviewed-by: gabi Merge-request: 694
* | | | | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | | | | | | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEPLOYMENT instruction uses .sources, while INSTALLS uses .files. This is inconsistent, and we fix it in Qt 4 by adding .files as a supported alternative for DEPLOYMENT. This commit will be followed by a second, which aligns Qt build system. For Qt 5, this needs to be cleaned up by removing support for .sources. Task-number: QTBUG-3216 Reviewed-by: João Abecasis Cherry-picked from 730a5d562fcb7be6428458962456033054f99e4c by Frans Englich. Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp
* | | | | | | Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-10-071-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. Task-number: QTBUG-14280 Reviewed-by: Janne Anttila
* | | | | | | Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-10-071-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. Task-number: QTBUG-13367 Reviewed-by: Janne Anttila
* | | | | | | Make default application deployment removableMiikka Heikkinen2010-10-071-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. Task-number: QTBUG-13367 Reviewed-by: axis
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-051-7/+7
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Doc: add missing image.Yann Bodson2010-10-011-7/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-04129-130/+230
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-30127-129/+129
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
| | * | | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-29127-129/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-281-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| | * | | | Fixed incorrect snippet in BLD_INF_RULES documentationMiikka Heikkinen2010-09-271-0/+7
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe
| * | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | |_|/ | |/| | | | | | | | | | (cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
| * | | Doc: Added info on QWidget::render to printing docsGeir Vattekar2010-09-201-0/+54
| |/ / | | | | | | | | | | | | Task-number: QTBUG-2210 Reviewed-by: David Boddie
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-21129-131/+511
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-17125-125/+407
| |\ \ | | |/ | |/|
| | * Doc: Further QML improvements.David Boddie2010-09-153-0/+53
| | |
| | * Doc: Continued work on the QML documentation.David Boddie2010-09-141-0/+87
| | |
| | * Doc: More work on the QML documentation.David Boddie2010-09-14123-125/+267
| | |
| * | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-161-3/+39
| | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-1072-824/+2513
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1072-824/+2513
| | |\ \ | | | |/
| * | | Clarified the coding standard regarding connecting signals to slots.Jerome Pasion2010-09-101-2/+10
| |/ / | | | | | | | | | | | | | | | Cleaned up the contradiction identified in QTBUG-10114. Reviewed-by: David Boddie Bug: QTBUG-8961, QTBUG-10114
| * | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-032-48/+2
| |\ \
| * | | Adding snippet for QML Text element documentation.Jerome Pasion2010-08-311-0/+54
| | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-13243
| * | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1077-810/+3552
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | | Doc: More work on the QML documentation.David Boddie2010-09-076-0/+312
| | | |
| * | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-0/+0
| | | |
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-032-50/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| | * | Fix examples autotestJoona Petrell2010-09-012-48/+2
| | |/ | | | | | | | | | | | | Task-number: Reviewed-by: Bea Lam
| | * Doc: Fixed snippets in QML introduction broken in an earlier commit.David Boddie2010-08-2717-0/+1099
| | | | | | | | | | | | Reported on the qt-qml mailing list.
| * | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| | |
| * | Doc: More work on QML documentation and snippets.David Boddie2010-09-013-1/+80
| | |
| * | Doc: More work on the QML documentation.David Boddie2010-08-2714-0/+686
| | |
View Lorry Controller Status