summaryrefslogtreecommitdiffstats
path: root/src/imports/particles
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-133-3/+3
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-293-72/+72
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-013-6/+6
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-113-3/+3
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-251-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qeventdispatcher_symbian.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/opengl/qgl.cpp src/opengl/qgl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qclipboard/test/test.pro tests/auto/qsound/qsound.pro
| * Fix deployment for declarative tests, examples on SymbianDamian Jansen2011-10-041-3/+3
| | | | | | | | | | Task-number: QTBUG-21306 Reviewed-by: Rohan McGovern
| * Update licenseheader text in source filesJyri Tahtela2011-05-133-51/+51
| | | | | | | | | | | | | | 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-133-51/+51
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-172-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-2/+2
| | | | | | | | 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
* 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-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
* 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-161-0/+4
| | | | ...and a set of functional group pages.
* 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-221-4/+4
|/ | | | 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-051-1/+2
|\
| * Fixed deployment locations for various profiles.axis2010-07-021-1/+2
| | | | | | | | 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
* 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
* Ensure ParticleMotionGravity always pulls in the right direction.Michael Brasser2010-06-041-4/+6
|
* Remove version ifdefs from Particles; only 4.7 is supported.Michael Brasser2010-06-041-16/+0
|
* Unify naming of import plugin targetsJoona Petrell2010-05-263-4/+4
| | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* More QML doc consistency.Martin Jones2010-04-161-7/+7
|
* Simplify QML import plugin deployment linesJoona Petrell2010-04-161-2/+1
| | | | | Task-number: Reviewed-by: Martin Jones
* Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-151-2/+8
| | | | Task-number: QTBUG-9908
* Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-141-1/+1
| | | | | Task-number: Reviewed-by: Martin Jones
* Make it clear that Qt.labs modules may not remain compatible.Martin Jones2010-04-141-0/+2
| | | | Task-number: QTBUG-9807
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-011-1/+1
|\ | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| * Add media elements to the QML Elements docs.Martin Jones2010-04-011-1/+1
| |
* | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-311-1/+1
|/
* Fix installation of qmldir filesAlan Alpert2010-03-301-1/+1
| | | | | | | The old pro files did not actually install the qmldir files in clean builds. These ones should work. Reviewed-by: Harald Fernengel
* Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+11
| | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
* Document Particles module import.Martin Jones2010-03-261-0/+5
|
* Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-4/+0
|
* Initialize variable.Martin Jones2010-03-191-1/+1
|
* fix installation of imports librariesYann Bodson2010-03-151-4/+3
|
* no need to include this private headerYann Bodson2010-03-111-1/+1
|
* fix particles pluginYann Bodson2010-03-111-1/+15
|
* Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-115-0/+1665
Task-number: QT-2846