| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.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>
|
| |
|
|
|
|
|
|
|
| |
The location of included QML files in demos had changed at some point,
but the symbian specific QML deployment parts were not updated to
reflect the new locations, thus breaking compilation.
Change-Id: Id01a685ca1de75cf73d32170b9f404c6619da7f5
Reviewed-by: Shane Kearns <ext-shane.2.kearns@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>
|
| |
|
|
|
|
|
| |
This example is not meant to be executed without qmlviewer, yet most
of it works. Add a warning for the uninitiated.
Reviewed-by: trustme
|
| |
|
|
| |
Rubberstamped-by: Oswald Buddenhagen
|
| |
|
|
|
|
|
| |
- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)
Reviewed-by: Casper van Donderen
|
| |
|
|
|
|
|
| |
The qml files were moved within the examples, the qrc files were not
updated accordingly. This change fixes the problem.
Reviewed-By: Daniel Molkentin
|
| |
|
|
|
|
|
| |
Removed empty lines from snake.qml and Cookie.qml
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Dynamic object in Docs explains QScriptValue argument.
SameGame and Dynamic scene now make use of overloadable.
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
| | | | |
|
| | | | |
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Replaces qmlviewer's runtime.activeWindow property.
Task-number: QTBUG-13351
Reviewed-by: Martin Jones
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The message was talking about a C++ plugin when the demo
is nowadays in a form of a standalone executable.
Task-number:
Reviewed-by: Bea Lam
|
| | | |\ \ |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-14909
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
deleted the during device orientation change
Task-number: QT-3824
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-14714
|
| |\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |/
| |/|
| | |
| | | |
Task: QT-4298
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-15011
Reviewed-by: Martin Jones
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-4249
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The real problem is QTBUG-15047, but by implementing SameGame in a
different way it gets worked around very nicely.
Task-number: QTBUG-14716
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add autotest for QScriptExtensionPlugin
Improve QtScript test coverage
Don't crash when null-pointer is passed to qScriptValueFromValue()
Simplify object lifetime management when moving objects to a QThread
samegame: white space
Move list of trusted benchmarks out of QA dungeon and into Qt
Don't put Objective-C sources in SOURCES
mkspecs: Emit warning when including g++.conf directly
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add autotest for QScriptExtensionPlugin
Improve QtScript test coverage
Don't crash when null-pointer is passed to qScriptValueFromValue()
Simplify object lifetime management when moving objects to a QThread
samegame: white space
Move list of trusted benchmarks out of QA dungeon and into Qt
Don't put Objective-C sources in SOURCES
mkspecs: Emit warning when including g++.conf directly
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Kai Koehne
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | / /
| | | |/ /
| | |/| | |
|
