summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-10/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * docWarwick Allison2010-11-091-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-051-9/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update visual tests for Mac. Run all QML visual tests now. Make qmlvisual tests more stable Add documentation about script evaluation context and allowed types Maintain passing visualtests on X11 Fix errors in example code. Also reverts the example code to the old Largely rewrite the Using QML in C++ Applications documentation. It Document list type operations Fix regression in 648eb76c and update visual tests. Don't emit xChanged()/yChanged() twice. Add testcase for QTBUG-13719. Doc fix highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. Regression: QDeclarativeText does not update when text turns empty Qml Debugging: Only enable if explicitly requested Regression: Text element breaks when using \n for separating lines Removing a binding while it is being applied caused a crash.
| | * highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-031-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | Also, the currentIndex stayed -1 since the views all bound to each others currentIndex, which starts as -1. Task-number: QTBUG-14794 Reviewed-by: Yann Bodson
* | | compile fix for namespaced Qthjk2010-11-082-1/+5
| | |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-047-295/+353
|\ \ \ | |/ /
| * | Fix bearermonitor when building for Maemo in scratchbox.Aaron McCarthy2010-11-047-295/+353
| |/ | | | | | | | | Use the correct ui file when building in scratchbox. Remove use of message boxes.
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-1/+4
|\ \ | |/
| * Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-261-1/+4
| | | | | | | | | | | | | | | | | | | | Only add ICON for Qt gui application projects that do not explicitly want to suppress it in symbianpkgrules.pri. This logic should match the logic used for setting RSS_RULES.icon_file and thus avoid empty TARGETFILE in bld.inf mifconv extension. Task-number: QT-4193 Reviewed-by: Janne Koskinen
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2557-2/+3734
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2557-2/+3734
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-221-41/+0
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-201-16/+18
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-201-1/+1
| | |\ \ \
| | * | | | Fixed case of a library file name to enable MinGW builds on Fedora.David Boddie2010-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14484 Reviewed-by: Marius Storm-Olsen
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-152-1/+109
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-142-1/+109
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-085-47/+198
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-085-47/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit Image Analyzer example.
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-071-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Doc: Renamed a project file.David Boddie2010-10-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14238
| | * | | | | | Doc: Added missing examples and snippets.David Boddie2010-10-0656-0/+3732
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14238
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-251-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
| | * | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Fixed spelling.Rohan McGovern2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trys -> tries
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-253-0/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-253-0/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| | * | | | | | Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13413 Reviewed-by: Andrew den Exter
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2523-60/+728
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-221-41/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Reviewed-By: Thomas Hartmann
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-191-16/+18
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Tic-tac-toe: Fix z-order of status text. Don't export QtDeclarative symbols needed by QtCreator on Symbian Properties take precedence over methods Call the correct vme meta object when connecting alias signals Fix Twitter demo's list view for devices Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| | * | | | | Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Bea Lam
| * | | | | | Only add ICON for application projects in symbianpkgrules.priMiikka Heikkinen2010-10-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build break is caused on some environments if ICON is defined for non-application projects, as application_icon.prf doesn't get processed for those, resulting in empty TARGETFILE field in bld.inf. Task-number: QT-4193 Reviewed-by: Janne Koskinen
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-1420-2/+709
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| | * | | | Added missing QtWebKit example files and some whitespace fixes.Jerome Pasion2010-10-095-47/+198
| | | |_|/ | | |/| |
| | * | | Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | | |/ | | |/|
| | * | Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-062-0/+4
| | | | | | | | | | | | | | | | old file name references.
| | * | Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-0414-0/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-04134-142/+157
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-309-57/+79
| | |\ \ \
| | * | | | Doc: Fixed a memory leak in the undo example.David Boddie2010-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13705 Reviewed-by: Geir Vattekar
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-1/+109
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
| |\ \ \ \ \
| | * | | | | Add new behavior example.Yann Bodson2010-10-131-0/+108
| | | |_|/ / | | |/| | |
| * | | | | Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that subtraction is not commutative. Who knew? Task-number: QTBUG-13532
* | | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-0813-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-04134-142/+157
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-30133-142/+142
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-29133-142/+142
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| * | | | Fix for bug QTMOBILITY-448 to list the default network configuration in ↵lsgunda2010-09-291-0/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bearermonitor example Merge-request: 827 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
generated by cgit v0.12 at 2024-12-28 23:45:32 (GMT)