| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
QPerformanceTimer was a copy of QElapsedTimer with some additional functionality
which has since been subsumed into QElapsedTimer, so remove the forked code.
(backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative)
(backport of d733f6a942e40e58ebc09f1d4414e2f8fa3f6a28 from qtquick1)
Change-Id: I261f0e957ffe3fc5fe42cd50672d2dd99b080f1e
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
These changes are mostly a backport from qtbase and a fix to
those tests that are dependent on private APIs.
Change-Id: I6e647583d7aaddf525d719c3b61f59a0c9aedf74
Reviewed-by: Rohan McGovern
Reviewed-by: Friedemann Kleint
|
| |
|
|
|
|
|
|
| |
New files after previous license change round.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
These are fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430
Reviewed-by: Kim Gronholm
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Change-Id: Ib923e5d3946e99001ef682a9dd8ca6d7788818a3
Reviewed-by: Aaron Kennedy
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ |
|
| | | |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To run the list of trusted benchmark do 'make check-trusted' in
either the root benchmarks directory or for any of the immediate
sub-targets. Normal 'make check' environment variables apply,
such as TESTRUNNER and TESTARGS.
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qdeclarativeglobal and tst_creation.cpp
Task-number:
Reviewed-by: Martin Jones
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/benchmarks/declarative/binding/binding.pro
tests/benchmarks/declarative/creation/creation.pro
tests/benchmarks/declarative/creation/tst_creation.cpp
tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-9491
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These tests were either not compiling, were deploying incorrectly,
or looking for data files from wrong place.
Task-number: QTBUG-10661
Task-number: QTBUG-10666
Task-number: QTBUG-10667
Reviewed-by: Shane Kearns
|
|/
|
|
|
| |
Task-number: QTBUG-10665
Reviewed-by: Janne Anttila
|
| |
|
| |
|
|
|
|
|
|
| |
Since we aren't releasing for 4.6, all types are new in 4.7.
Task-number: QTBUG-10081
|
| |
|
| |
|
|
|
|
| |
Currently, by far the biggest chunk is QUrl hashing :-(
|
| |
|
|
|
|
| |
Consistent with "qml" runtime binary
|
| |
|
|
|
|
| |
Use setParent_NoEvent when parenting to group.
|
| |
|
| |
|