summaryrefslogtreecommitdiffstats
path: root/tools/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-0/+2
|\ | | | | | | | | | | | | | | | | | | 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
| * Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
| | | | | | | | | | Task-number: QTBUG-17472 Reviewed-by: Martin Jones
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-6/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-3/+3
| |\ | | | | | | | | | | | | Conflicts: tools/qml/qml.pri
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-201-3/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | | * Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e46c44f9538dbe5b44ce61d3a42403cfa471ae8b restructured qml.pri. In the original version the else part at the bottom of the file was processed for Symbian 3.1 and 3.2, but the commit stopped that from happening. This commit makes the minimal change to make the statements in the else part apply to 3.1 and 3.2 again. Really the file should be restructured to have separate logic for setting each vairable, but I'll leave that task for the developers. Reviewed-by: Eckhart Koppen
| * | | Another stab at fixing compilation on old Symbian platformsJoona Petrell2011-02-222-5/+3
| |/ / | | | | | | | | | | | | Task-number: QTBUG-17472 Reviewed-by: Martin Jones
| * | Fix compilation on old Symbian platformsJoona Petrell2011-02-181-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-17472 Reviewed-by: Martin Jones
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf mkspecs/symbian-gcce/qmake.conf src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/plugins/plugins.pro tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
| * | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-111-2/+2
| |/ | | | | | | | | | | | | | | | | On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging' folder, which broke remote debugging of QtDeclarative completely. New name 'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name. Task-number: QTBUG-17360 Reviewed-by: Martin Jones
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-047-47/+89
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Froze Symbian def files for QtQuick11.juhvu2011-02-011-0/+5
| | | | | | | | Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1918-20/+18
| |\
| * | Fix declarative autotest compilation on SymbianJoona Petrell2011-01-182-10/+13
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Add a way to clear warnings in qmlviewer warnings window on SymbianJoona Petrell2011-01-182-1/+8
| | | | | | | | | | | | | | | | | | | | | Basically by adding a clear soft key to the currently empty right soft key in warninng window in qmlviewer. Task-number: Reviewed-by: Martin Jones
| * | Add a warning when translating QML application in qmlviewer failsJoona Petrell2011-01-171-2/+5
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Remove unnecessary debug traces from declarative classesJoona Petrell2011-01-171-1/+0
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Add no warnings label to qmlviewer warnings windowJoona Petrell2011-01-102-1/+18
| | | | | | | | | | | | | | | | | | | | | Small developer usability improvement Task-number: Reviewed-by: Bea Lam
| * | Provide qmlviewer warning window also on SymbianJoona Petrell2010-12-313-31/+35
| | | | | | | | | | | | | | | Task-number: QTBUG-10800 Reviewed-by: Christopher Ham
| * | Forward qmlviewer traces to system's default message handler on SymbianJoona Petrell2010-12-301-4/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-16353 Reviewed-by: Christopher Ham
| * | QDeclarativeDebug: Include debugger plugin in qmlviewer.sisKai Koehne2010-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | Developers that want to debug qml on their device have to now install qmlviewer.sis. Reviewed-by: Christiaan Janssen
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1718-18/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1018-18/+18
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-2/+0
|\ \ \ | |/ /
| * | QmlViewer: Remove unused class variablesKai Koehne2011-01-071-2/+0
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-138-48/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * Build on SymbianMartin Jones2010-12-121-13/+13
| | | | | | | | Reviewed-by: Michael Brasser
| * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| |
| * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| |
| * QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| | | | | | | | | | | | | | | | | | | | | | We can't use atexit() handler to show a warning, since whether the QApplication object then still exists or not is undefined. Instead, call the method directly where it makes sense (warnings about command line arguments etc). Task-number: QTBUG-15740 Reviewed-by: Thomas Hartmann
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-063-3/+12
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Give qmlviewer a minimum size if root object has no size.Bea Lam2010-12-031-1/+1
| | | | | | | | | | | | | | | | de8c9d69fa7c7cc50e9a238e58f6e9370f158fc4 ensured the window was at least partly visible on Windows and Linux but it did not work on Mac. Task-number: QTBUG-15783 Reviewed-by: Alan Alpert
| * Fix Browser.qml warningsJoona Petrell2010-11-301-2/+2
| | | | | | | | | | Task-number: QTBUG-15720 Reviewed-by: Martin Jones
| * Fixup visual tests on MacAlan Alpert2010-11-251-0/+9
| | | | | | | | Disable sub-pixel antialiasing and skip text on 10.5
* | QScroller merge, part 1Robert Griebl2010-12-021-6/+6
|/ | | | | | | | | | | | | | This merge consists of the actual kinetic scroller implementation, its autotests plus a few examples. QAbstractScrollArea and QAbstractItemView have been extended to support the new scroll events. The complete history is in http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture (part 2 is the QML Flickable replacement / part 3 is QWebView support) Task-number: QTBUG-9054 Reviewed-by: Ralf Engels
* Prevent crash when calling reload() from within a .qmlDamian Jansen2010-11-231-1/+1
| | | | Task-number: QTBUG-15493
* Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
|
* Record images on more than just the first frame.Alan Alpert2010-11-161-1/+1
| | | | | | 8fc0d1c36cae1b0 introduced this bug when recording new visual tests. Task-number: QTBUG-14792
* Turn off font antialiasing during tests.Alan Alpert2010-11-161-10/+9
| | | | | | | | | | | Font antialiasing varies from machine to machine, and so is too unstable Also switching to a monospaced font in visual tests to attempt to pre-empt another possible source of instability. This commit also slightly increases verbosity of test failure messages to be more useful in the CI system Task-number: QTBUG-14792
* Take snapshots starting from the first frameAlan Alpert2010-11-151-1/+6
| | | | | | | | Partly because it's invaluble for the times people forget to record a test as a snapshot, partly because it provides more data on the initial state of the test case. Task-number: QTBUG-14792
* Fix QML visual tests on Mac.Yann Bodson2010-11-011-0/+8
| | | | Task-number: QTBUG-14792
* Update webview visual tests to new skip modeAlan Alpert2010-10-291-4/+2
| | | | | | | | New mode requires them to at least compile. Now that I've noticed this, removing that check on compile failures in QDeclarativeTester. Task-number: QTBUG-14792
* Add 'skip' property that QML visual tests can useAlan Alpert2010-10-294-6/+33
| | | | | | | | | | This property can be set with a reason to skip the test (i.e. known bug) and the failure will not count for blocking purposes. This change also alters one of the failing tests to use the new property Task-number: QTBUG-14792 Reviewed-by: Michael Brasser
* Fix recording of visual tests.Michael Brasser2010-10-191-0/+2
|
* Keep qmlviewer from disappearingAlan Alpert2010-10-151-0/+1
| | | | | | qmlviewer was disappearing if the scene was 0x0. Now it's just unusably small, which is correct as it will highlight the problem to the developer.
* Support device orientation in harmattanMartin Jones2010-10-072-0/+166
| | | | | Task-number: QTBUG-14137 Reviewed-by: Aaron Kennedy
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-0/+1
| | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799
* QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
|
* QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
| | | | | | | | | | | The QApplication object in main() is already destroyed when showWarnings() is called. Create another instance in this case. (Note that the assert will only be triggered for debug builds, while qmlviewer is built in release mode by default). Task-number: QTBUG-14009 Reviewed-by: Thomas Hartmann
generated by cgit v0.12 at 2024-11-14 12:22:28 (GMT)