summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeimage
Commit message (Collapse)AuthorAgeFilesLines
* Fixed QtDeclarative autotest deployment for WinCE devices.jaanttil2012-02-061-1/+2
| | | | | | Change-Id: Id42aefd69484d5cfe1f44566dffce4b05db5aa19 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | 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>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2011-12-281-0/+1
| | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a Reviewed-by: Jo Asplin
* Properly protect access to pixmap reader thread with mutexChris Adams2011-11-152-0/+85
| | | | | | | | | | | | Previously, access to the data from the reader thread wasn't guarded properly, causing a crash when the reader thread was deleted prior to QDeclarativePixmapData (which then attempted to dereference the thread pointer to cancel the request), or in the case where a QDeclarativePixmapData was deleted after its QDeclarativePixmapReply was removed from the jobs queue but prior to processing. Reviewed-by: Martin Jones Task-number: QTBUG-22125
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-1/+13
|\
| * Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-072-1/+13
| | | | | | | | | | | | | | | | Avoid an extra setImplicitWidth/setImplicitHeight on image load. Change-Id: I8bec1c97244068000c7a7f5fb3e937f80f3b36f5 Task-number: QTBUG-18573 Reviewed-by: Michael Brasser
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-011-0/+22
|\ \ | |/
| * Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-311-0/+22
| | | | | | | | | | | | | | | | | | Image sourceSize lacked a RESET method to allow reverting to the natural size of the image. Change-Id: I4e9089d8e16991375745db553f891bd377143eab Task-number: QTBUG-18442 Reviewed-by: Yann Bodson
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-172-0/+54
|\ \ | |/ | | | | | | Conflicts: tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
| * Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-172-0/+54
| | | | | | | | | | | | | | | | | | | | | | The sourceSize should always be the size of the image, unless set otherwise. When calculating the size of an image with Image.PreserveAspectFit set the natural image size should be used for the calculation if no size has been set explicitly. Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69 Task-number: QTBUG-16389 Reviewed-by: Joona Petrell
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-10/+148
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-271-2/+43
| | | | | | | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
| * Rename Image::cached to 'cached' (and QDeclarativePixmap::Cached also)Bea Lam2011-01-191-7/+7
| | | | | | | | | | | | | | | | This is to keep consistent property naming consistent. E.g. Image has 'smooth', 'mirror' properties rather than 'smoothed', 'mirrored'. For consistency QDeclarativePixmap::Cached was renamed as well. Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-072-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-202-0/+0
| |\ \ \
| * | | | Add 'mirror' property to Image element.Bea Lam2010-12-101-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting mirror to true will horizontally invert an image. This feature is part of the task to support RTL in QML (see QTBUG-11042). Task-number: QTBUG-15878 Reviewed-by: Joona Petrell
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-0/+30
| |\ \ \ \
| * | | | | Add 'cached' property to Image elementYann Bodson2010-11-121-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting cached to false is useful when dealing with large images, to make sure that they aren't cached at the expense of small 'ui element' images. Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-202-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Update test bitmaps for QDeclarativeImage::svg() autotest on WindowsJoona Petrell2010-12-202-0/+0
| | |_|/ | |/| | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-202-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * | | Update test bitmaps for QDeclarativeImage::svg() autotest on LinuxJoona Petrell2010-12-172-0/+0
| | |/ | |/| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | | Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits) Fix warnings, whitespace cleanup Don't rely on uninitialized data Doc: Fixing typo Doc: Fixing typo Skip failing tests Use effective user id instead of getlogin Fix compile error in tst_qfileinfo on Mac/Linux Fix tst_QFileInfo owner() & group() failure on Windows. Fix tst_QFileInfo::canonicalFilePath failure on Windows Fix QDir::relativeFilePath Fix spelling in comments Add missing license header to test case Define _WIN32_WINNT before any includes New attempt at fixing compilation failure Removing unused duplicate definitions No symbolic links in Windows CE Set minimum target Windows version to 2000 More missing includes Add missing include Fix compile error ...
| * \ \ Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-233-3/+107
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * | | | Fix deployment for examples and testsShane Kearns2010-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-0/+30
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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
| * | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-0/+30
| | |/ | |/| | | | | | | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-0/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Image bounding rect should always include the area being paintedJoona Petrell2010-11-052-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | This didn't always happend with fillMode PreserveAspectCrop, resulting in drawing artifacts. Task-number: QT-3933 Reviewed-by: Martin Jones
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-2/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | Image.sourceSize is incorrect after changing Image.sourceYann Bodson2010-10-081-2/+32
| |/ | | | | | | Task-number: QTBUG-14303
* | 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
* Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-051-0/+41
| | | | Task-number: QTBUG-14197
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-10/+10
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Autotest for QTBUG-13454.Yann Bodson2010-09-101-14/+54
|
* Setting one dimension of the sourceSize should set the other dimension.Yann Bodson2010-08-251-7/+7
| | | | | | The implicit width and height should also be set to the sourceSize. Task-number: 13002
* Fix Image element svg autotestJoona Petrell2010-08-199-12/+4
| | | | | | | | | | Also, reduced some platform-specific test as the test case is not meant to test regression in the painting routines, but that Image's svg support works. Task-number: Reviewed-by: Martin Jones
* Ensure redirects (and indeed all reply process) is done in the right thread.Warwick Allison2010-07-211-0/+2
| | | | | | | i.e. the thread with the QNAM the original reply was created in. Task-number: QTBUG-12302 Reviewed-by: Aaron Kennedy
* Remove Image::pixmap property. QML applications should useBea Lam2010-07-081-31/+0
| | | | | | QDeclarativeImageProvider to provide pixmaps instead. Task-number: QTBUG-11980
* Fix test for N900 (ARM-specific SVG results).Warwick Allison2010-07-024-8/+6
|
* Make autotests work with qreal == float (in addition to double).Warwick Allison2010-07-023-8/+14
| | | | Task-number: QTBUG-11853
* Make declarative autotests compile on Symbian abld build systemJoona Petrell2010-06-082-3/+5
| | | | | Task-number: Reviewed-by: Martin Jones
* Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-181-1/+1
| | | | Also rearrange the parameter order to be more clear.
* Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-141-1/+8
| | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones
* Rename QDeclarativeExpression::value() to evaluate().Michael Brasser2010-04-221-1/+1
| | | | | QDeclarativeExpression can be used to evaluate any sort of expression, not just those returning a value.
* QDeclarativeImage should stretch in one direction when tiling in the other.Yann Bodson2010-04-193-1/+92
| | | | | Task-number: QTBUG-6716 Reviewed-by: Michael Brasser