summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-2235-178/+174
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-2251-175/+244
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-2248-171/+219
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-09-2215-22/+68
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Renaming: QFxView -> QmlViewYann Bodson2009-09-2231-137/+137
| | | | |
| | * | | Particles no longer paints things itself.Michael Brasser2009-09-221-2/+0
| | | | |
| | * | | Fixes for framerate monitor.Michael Brasser2009-09-223-2/+25
| | | | |
| * | | | Clean up Same Game JSAlan Alpert2009-09-221-37/+12
| |/ / / | | | | | | | | | | | | Delayed loading is never used and is poorly implemented, so remove it.
* | | | Preliminary support for object and list synthesized property typesAaron Kennedy2009-09-2218-922/+1198
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-2220-45/+88
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/snippets/declarative/repeater.qml
| * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-222-12/+14
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Repeater doc update.Yann Bodson2009-09-212-12/+14
| | |/
| * | import does not currently insist on a version, it should for these casesWarwick Allison2009-09-225-0/+14
| | | | | | | | | | | | (but not for non-installed local files)
| * | Syntax updateWarwick Allison2009-09-227-20/+39
| | | | | | | | | | | | | | | id must not be a type Image::fillMode change
| * | Ensure absolute path for qmldir URL.Warwick Allison2009-09-221-2/+3
| | |
| * | Missing files.Warwick Allison2009-09-222-0/+12
| |/
| * Fixed compile for example support libraryThorbjørn Lindeijer2009-09-213-11/+7
| |
* | DocAaron Kennedy2009-09-221-3/+4
|/
* Fix exampleAaron Kennedy2009-09-211-2/+2
|
* Allow paths to be excluded from testAaron Kennedy2009-09-211-0/+17
|
* Rename samegameAaron Kennedy2009-09-211-0/+0
|
* Rename samegameAaron Kennedy2009-09-211-0/+0
|
* Add an autotest to ensure all our examples/demos launchAaron Kennedy2009-09-213-0/+147
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-212-23/+78
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Get the framerate monitor working again.Michael Brasser2009-09-212-23/+78
| |
* | Basic implementation of visual "test scripts"Aaron Kennedy2009-09-2111-29/+723
|/ | | | Test scripts allow the qmlviewer to record a set of input actions, and the resulting visual frames.
* Add a rotated flickr-mobile versionAaron Kennedy2009-09-211-0/+10
|
* add a -fullscreen option.Lars Knoll2009-09-181-2/+6
|
* Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-182896-30193/+360543
|\ | | | | | | | | Conflicts: configure.exe
| * Fix symbol clashes between QtWebKit and QtScriptSimon Hausmann2009-09-181-0/+1
| | | | | | | | | | | | Rename the JSC namespace to QTJSC. Reviewed-by: Lars Knoll
| * Fix compilation and remove trailing whitespace.Jason Barron2009-09-181-140/+140
| | | | | | | | | | | | Fix compilation on systems that support the extended bitmap format. Reviewed-by: Jani Hautakangas
| * System locale on Mac may not return AnyCountry for any language != Ccon2009-09-181-2/+5
| | | | | | | | | | | | Because of QLocale limitations this broke other places. Reviewed-by: Denis Dzyubenko
| * Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-1812-6/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
| * Add debug outputPaul Olav Tvete2009-09-181-0/+7
| | | | | | | | | | | | | | | | This test mysteriously fails when run from the autotest system, but succeeds when run manually. We need more data to find out what is going on. Sort-of-reviewed-by: Jesper
| * Remove remaining support for win32-mwc mkspecIain2009-09-184-277/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks compiler supplied with Symbian/S60 releases does not contain enough support to build the Qt host tools in a Unicode version, and ANSI support has been removed in 4.6. Alternative mkspecs are win32-g++, requiring mingw tools to be installed, or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express edition is fine) The mwc makefile for qmake was already removed, so this just removes the remaining support. Reviewed-by: Jason Barron
| * Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for the fact that removing --export_all_vtbl from the RVCT command line seems to cause problems when linking the static s60main lib with apps built with GCCE (at least 4.3, haven't tested earlier versions) The root cause still needs to be found and fixed, after which this workaround can hopefully be removed. Problem observed on Symbian^3 release, RVCT 2.2 build 686, GCC-E 2009q1-162 release from CodeSourcery. Reviewed-by: axis
| * Fixed bug in GL pixmap backend (causing missing rendering in lance).Samuel Rødal2009-09-181-1/+5
| | | | | | | | | | | | | | Since copyBackFromRenderFbo() manually changes the framebuffer object binding, we also need to update the context's current_fbo member. Reviewed-by: Kim
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-181-31/+31
| |\
| | * Change name of test to tst_QGraphicsAnchorLayout1Jan-Arve Sæther2009-09-181-31/+31
| | |
| * | Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-1819-256/+1123
| |/ | | | | | | | | | | | | | | | | This is done to reduce heap consumption and to give a possibility to share bitmaps across process. QPixmap maps to Symbian CFbsBitmap which is stored in Symbian font and bitmap server. Reviewed-by: Jason Barron
| * Stabilize testOlivier Goffart2009-09-182-3/+3
| |
| * Don't fail if no printers are available.Paul Olav Tvete2009-09-181-0/+3
| |
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-182325-29695/+120329
| |\
| | * Only ignore the addChildLayoutItem warning in debug builds.Jan-Arve Sæther2009-09-181-1/+4
| | | | | | | | | | | | We only output that message in debug builds....
| | * Don't loose precision by converting the sizes (qreals) to ints.Jan-Arve Sæther2009-09-181-16/+12
| | | | | | | | | | | | Reviewed-by: leo
| | * Call effectiveSizeHint(Qt::MinimumSize).width instead of minimumWidth()Jan-Arve Sæther2009-09-181-48/+40
| | | | | | | | | | | | | | | | | | Small refactoring, since the two code blocks were almost the same. Reviewed-by: leo
| | * Copied Windows CE compatiblity date/time conversion functions from WebKitSimon Hausmann2009-09-182-0/+693
| | | | | | | | | | | | | | | | | | | | | | | | into this separate location, so we don't need to patch WebKit anymore. As discussed with Joerg Reviewed-by: Trust me
| | * make qscriptvalue_cast<QVariant>() compile again on WindowsKent Hansen2009-09-181-2/+4
| | | | | | | | | | | | | | | This change was lost when the new qtscript-jsc backend was introduced (the change is already in 4.5).
| | * Removed JavaScriptCore.pro file that shouldn't be there.Simon Hausmann2009-09-182-69/+1
| | | | | | | | | | | | Reviewed-by: Trust me
| | * Updated WebKit from /home/shausman/src/webkit/trunk to ↵Simon Hausmann2009-09-187-12/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.6-staging ( f572f72dce91be9a4525941c87d1b0a8c383ba39 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-09-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Fixed a bunch of documentation warnings. * Api/qwebgraphicsitem.cpp: * Api/qwebplugindatabase.cpp: * Api/qwebpluginfactory.cpp: * Api/qwebsecurityorigin.cpp: 2009-09-18 Warwick Allison <warwick.allison@nokia.com> Reviewed by Simon Hausmann. Added a test that console output works. * tests/qwebpage/tst_qwebpage.cpp: (ConsolePage::ConsolePage): (ConsolePage::javaScriptConsoleMessage): (tst_QWebPage::consoleOutput):