summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7Toby Tomkins2011-06-081-10/+10
|\
| * Fixed qmlshadersplugin on windows VC2008 toolchain.Marko Niemelä2011-06-081-10/+10
| | | | | | | | | | | | This fix is originally submitted by George Tavares. APIENTRY is a Win32 macro defined as stdcall__ * Reviewed-by: Kim Gronholm
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3116-0/+2855
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| * Fixed more CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-261-1/+1
| | | | | | | | | | | | These are additional fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430 Reviewed-by: Kim Gronholm
| * Fixed CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-264-9/+9
| | | | | | | | | | | | These are fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430 Reviewed-by: Kim Gronholm
| * Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1Marko Niemelä2011-05-2516-0/+2855
| | | | | | | | | | | | | | | | This issue is about backporting Scenegraph's ShaderEffectItem and ShaderEffectSource elements into Qt Quick 1.1 as a Qt labs plugin. Purpose of these elements is to provide an interface for utilizing OpenGL shaders in QML applications. Task-number: QTBUG-18346 Reviewed-by: Kim Gronholm
| * Update licenseheader text in source filesJyri Tahtela2011-05-138-136/+136
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-138-136/+136
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-1/+5
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc
| * \ Merge branch 'mimir' into 4.7David Boddie2011-02-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
* | \ \ 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-03-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/opengl/qpixmapdata_gl.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/qtextlayout/tst_qtextlayout.cpp
| * | | FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-281-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | beginRemoveRows() takes the first and last index as parameters, but it was passing count rather than count-1 as the last index. Change-Id: I81a6fbf085acacf5f8c1ca847b0bdc826bcf405b Task-number: QTBUG-17775 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-178-8/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-108-8/+8
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-231-0/+33
|\ \ \ | |/ /
| * | More docs for FolderListModelMartin Jones2010-12-231-0/+33
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Fix Browser.qml warningsJoona Petrell2010-11-301-1/+1
| | | | | | | | | | Task-number: QTBUG-15720 Reviewed-by: Martin Jones
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-303-3/+0
|\ \ | |/
| * Remove unnecessary QML import project dependency to Symbian deployment pri ↵Joona Petrell2010-10-293-3/+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-083-6/+6
|/ | | | | | | | | | 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
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-243-7/+7
| | | | | | | 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
|
* Fix slot naming clashMartin Jones2010-09-122-3/+3
| | | | Reviewed-by: David Boddie
* Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-24/+72
|
* Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-33/+0
|
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+7
| | | | ...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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-221-3/+16
|\
| * Clean up particle motion documentationAlan Alpert2010-07-141-3/+16
| | | | | | | | Task-number: QTBUG-11917
* | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-222-5/+5
|/ | | | Task-number: QTBUG-11512
* Private variable cleanup.Michael Brasser2010-07-131-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-054-4/+7
|\
| * 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-023-3/+6
| |/ | | | | | | RevBy: Trust me
* | Make declarative pixmap cache easier to useAaron Kennedy2010-07-051-23/+10
|/ | | | | | | | | | | | | | | | | The QDeclarativePixmapCache was both slow, and very trickey to use correctly. Many QML elements did not correctly cancel outstanding requests, which leads to pixmaps leaking indefinately. Other elements, such as Text, were subject to race conditions that meant they may never actually load all their images. QDeclarativePixmap is a single class than encapsulates the action of fetching a pixmap, as well as the pixmap itself and the responsibility of canceling outstanding requests. Rather than relying on Qt's pixmap cache that doesn't cache all the information QML needs, QDeclarativePixmap implements its own cache, that correctly degrades over time (unlike QPixmapCache that can stop expiring items in some conditions). Reviewed-by: Warwick Allison
* 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-233-0/+3
| | | | | | ...otherwise we cannot Symbian sign them. Reviewed-by: Miikka Heikkinen
* Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-223-3/+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
* Remove the old WebView element in src/import. The new one is in ↵Alexis Menard2010-06-187-1760/+0
| | | | | | | | | src/3rdparty/webkit Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-103-22/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (39 commits) Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and Document attached properties Add 'on' prefix to documentation of signals Stablize qmlviewer test Improve test stability. qmlviewer: ensure that only clicks on the current file list are handled. Doc improvements: move some example code to snippets, add screenshots, Move some example code into snippets/ and add other doc fixes Fix crash when changing ListView model with highlightRangeMode: ListView.StrictlyEnforceRange Fix GridView bounds behavior with snapping enabled. Small optimization when checking if MouseArea's onPressAndHold is Fix autotest. Fixed `nmake clean' breaking declarative imports on Windows. Fix drawing flicker on Qml Viewer startup Fix snake demo Add qmlmethod Item::childAt() to delarative item Cursor positioning in QTextDocument after undo() Fix slow network access in qmlviewer (Windows) Don't layout multiple times when an ancestor becomes (in)visible. Add an example of animated item add/remove in ListView ...
generated by cgit v0.12 at 2025-02-03 21:32:34 (GMT)