| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |\
| |
| |
| |
| | |
Conflicts:
src/opengl/qglshaderprogram.cpp
|
| | |
| |
| |
| | |
Reviewed-by: Trond
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-7391
Reviewed-by: Sarah Smith
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
GLfloat[2][2] & GLfloat[3][3] uniform setters.
Generic overrides to setAttributeArray() for setting the component
type to something other than GL_FLOAT.
setAttributeBuffer() for specifiying offsets within vertex buffers.
Task-number: QTBUG-7391
Reviewed-By: Sarah Smith
|
| |/
|
|
|
| |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |/
|
|
|
|
|
|
|
|
|
| |
We don't add new public methods in patch releases.
This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658.
This patch also fixes the paint engine to use glUniformMatrix3fv
directly now it has been removed from 4.6. It is a 3 line change.
Reviewed-By: Samuel
|
| |
|
|
| |
Reviewed-By: Rhys Weatherley
|
| |
|
|
| |
Reviewed-by: Sarah Smith
|
| | |
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
|
|
|
|
| |
After API review discussions, it was decided to remove shader
binary support until we have a better handle on what we need.
Applications can directly load shader binaries on the shaderId()
using glShaderBinary() directly so they aren't prevented from
using the feature.
Reviewed-by: trustme
|
| |
|
|
| |
Reviewed-by: Sarah Smith
|
| |
|
|
| |
Reviewed-by: Sarah Smith
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Samuel
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
| |
making it into a bitmask. I'll add GeometryShader in the future
Reviewed-by: Rhys Weatherley
|
| |
|
|
|
|
|
|
|
|
|
| |
It used to be possible to derive the shader type from the file extension,
but this isn't very extensible and doesn't capture the usual extensions.
Change it so that the shader type must be supplied explicitly.
Also add the addShaderFromFile() function to QGLShaderProgram to
provide a convenient short-cut for file-based shader creation.
Reviewed-by: Sarah Smith
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
| |
seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
| |
Task-number: QT-80
Reviewed-by: Ian Walters
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
|
| |
The shader compilers also report warnings, so it is more appropriate
to call the string a log.
Reviewed-by: trustme
|
| |
|
|
| |
Reviewed-by: Rhys Weatherley
|
| |
|
