summaryrefslogtreecommitdiffstats
path: root/src/imports/gestures
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-031-0/+4
|\ | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-021-0/+4
| | | | | | | | | | Change-Id: I5eb6d2826f673c7067fde1447f25d3fc97b5aa5e Reviewed-by: Bea Lam
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 invalid/incomplete QML code snippets.David Boddie2011-01-171-9/+9
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-173-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-3/+3
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-1/+0
|\ \ | |/
| * Remove unnecessary QML import project dependency to Symbian deployment pri ↵Joona Petrell2010-10-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | file used by Qt demos Task-number: QT-4197 Reviewed-by: Jason Barron * breaks compilation of releases that omit Qt demos directory * qt import plugins have different deployment configuration than demo applications * declarative import plugins already get their symbian-related settings from src\imports\qimportbase.pri that is basically a copy from qpluginbase.pri written for plugins
* | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-2/+2
|/ | | | | | | | | | 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
* Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-241-2/+2
| | | | | | | Setting DESTDIR=. shows an error from mv trying to move the file from the current directory to the same current directory. Reviewed-by: axis
* Doc fix.Michael Brasser2010-09-231-1/+1
|
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+2
| | | | ...and a set of functional group pages.
* Fixed the scope when evaluating GestureArea javascript expressionsDenis Dzyubenko2010-07-231-1/+1
| | | | | | | | | In the QML gesture example we access properties of the gesture by just accessing the "gesture" property, which is in fact in a GestureArea. To make it work I've set the GestureArea as a scope of the evaluated javascript expression. Reviewed-by: Warwick Allison
* Report errors when evaluating JavaScript expressions from the GestureArea ↵Denis Dzyubenko2010-07-231-1/+4
| | | | | | | | | | | | | QML plugin. Before the patch if the evaluation fails (for any reason - because you access invalid or non-existing property, or because of a spelling mistake, etc), the expression will be silently ignored, making if very hard to figure out what is going wrong. The patch makes sure the error description will be printed on the output. Reviewed-by: Warwick Allison
* Register a few gesture-related types in the meta-type system.Denis Dzyubenko2010-07-231-0/+7
| | | | | Reviewed-by: Zeno Albisser Reviewed-by: Volker Hilsheimer
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-031-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't write to the logger widget while the application is closing down. Fix exponential behavior of QTextCursor::removeSelectedText Fix test for N900 (ARM-specific SVG results). docs - fix doc links, minor improvements Fix TextEdit bitmap tests testing the wrong element Make autotests work with qreal == float (in addition to double). Fix TextInput text getting improperly clipped fix doc links Fix docs to link to the new QML Viewer page instead of the Runtime page qmlviewer: Update the proxy factory when the user changes the proxy. Don't accept *files* that exist when *directory* is required.
| * fix doc linksBea Lam2010-07-021-1/+1
| |
* | Fixed deployment locations for various profiles.axis2010-07-021-1/+2
|/ | | | RevBy: Trust me
* Docs - add more links to relevant examplesBea Lam2010-06-301-1/+1
| | | | Task-number: QTBUG-11754
* Provide Qml plugins with UID3s on SymbianAlessandro Portale2010-06-231-0/+1
| | | | | | ...otherwise we cannot Symbian sign them. Reviewed-by: Miikka Heikkinen
* Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-221-1/+0
| | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
* Add a new qconfig feature GESTURESTasuku Suzuki2010-06-023-1/+10
| | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Unify naming of import plugin targetsJoona Petrell2010-05-263-4/+4
| | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-181-1/+1
| | | | Also rearrange the parameter order to be more clear.
* syntax updateWarwick Allison2010-05-051-1/+1
|
* no export in pluginWarwick Allison2010-04-231-1/+1
|
* compileWarwick Allison2010-04-221-2/+1
|
* Simplify QML import plugin deployment linesJoona Petrell2010-04-161-2/+1
| | | | | Task-number: Reviewed-by: Martin Jones
* Make it clear that Qt.labs modules may not remain compatible.Martin Jones2010-04-141-0/+3
| | | | Task-number: QTBUG-9807
* Fix anchors, etc.Warwick Allison2010-04-062-2/+1
| | | | (pass parser status up to QDeclarativeItem)
* Labs (experimental) Gesture support.Warwick Allison2010-04-065-0/+461
By popular demand.
generated by cgit v0.12 at 2024-11-22 18:33:42 (GMT)