| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Paths to executables matter on that build system, unlike on Raptor.
RevBy: Trust me
|
|
|
|
| |
f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
|
|
|
|
| |
4f74cd44d77349759096bed091913b188a9167e4
|
|
|
|
| |
cba220f177154428d6103a93a819668be689a591
|
|\
| |
| |
| |
| | |
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed unnecessary data_caging_paths.prf loading from applications
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since plugin and import paths variables were moved to symbian.conf,
there were many unnecessary load(data_caging_paths) statements
left in applications.
Task-number: QTBUG-11619
Reviewed-by: Janne Koskinen
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Forgot one occurrence of org.webkit :)
Reviewed-by: Trust me
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Fix examples
Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd
Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef
Update S60 stuff after renaming the webkit component.
Update qmlchanges from import org.webkit to QtWebKit
Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a
Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5
Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit
Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5
Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Fix examples
Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd
Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef
Update S60 stuff after renaming the webkit component.
Update qmlchanges from import org.webkit to QtWebKit
Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a
Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5
Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit
Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5
Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Import QtWebKit instead of org.webkit
Reviewed-by: Trust me
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
Make sure ValueRecord's DeviceTables is cleaned up on failure
qdoc3: Build fix for regression in e2f0e728e
Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
Doc: Relicensed the documentation under the GNU FDL version 1.3.
doc: Added more DITA output to the XML generator
Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.
Fix for a leak in the mac style.
Doc: Fixing bugs to style and script
doc: Added more DITA output to the XML generator
Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
Fix compiler warnings in QtGui (text,painting).
Allow Unix to generate unique UUIDs if /dev/urandom exists.
Allow GNU Free Documentation license header.
Add missing license header.
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Fix example compile and runtime warnings, webkit examples not built.
qgl_cl_p.h is no longer existent
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Doc: Fixed documentation errors.
...
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
Doc: Relicensed the documentation under the GNU FDL version 1.3.
doc: Added more DITA output to the XML generator
Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.
Fix for a leak in the mac style.
Doc: Fixing bugs to style and script
doc: Added more DITA output to the XML generator
Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
Fix compiler warnings in QtGui (text,painting).
Allow Unix to generate unique UUIDs if /dev/urandom exists.
Allow GNU Free Documentation license header.
Add missing license header.
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Fix example compile and runtime warnings, webkit examples not built.
qgl_cl_p.h is no longer existent
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Doc: Fixed documentation errors.
doc: Added more DITA output to the XML generator
doc: Fixed type of Package::name
...
|
| | | |/
| | | |
| | | |
| | | | |
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | | |
|
|/ / / |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add screenshots for most examples and demos
Rename example: edit -> textselection
Clean up some examples
Rename example and add minor improvements
Rename example image file
Spelling fix
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Fixed device context leak in QGLWidget on Windows.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a13977ce2aba31808a046cddc082a84dc316d78b )
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77
Re-enable data structure packing in Harfbuzz for RVCT
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 85a48bdb52a81a9d18477a347fba5f6c930af416 )
Fixed memory lean in QImageVideoBuffer and QMemoryVideoBuffer.
QLocalSocket/Win: handle ERROR_MORE_DATA after read operation
Fix possible crash in QTextLayout for glyphless items
Attempt to stabilize tst_qtimeline::value
Attempt to stabilize tst_lconvert
Replace custom WAIT_FOR_CONDITION with semi-standard QTRY_COMPARE
Attempt to stabilize tst_qwidget::taskQTBUG_4055_sendSyntheticEnterLeave
Attempt to stabilize tst_qwidget::syntheticEnterLeave
Attempt to stabilize tst_qwidgetaction::visibilityUpdate
Attempt to stabilize tst_lupdate::good
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa3f786bdba4dc153620ae7f98e4b0e41770d1d1 )
Audio (osx); In pull mode emit readyRead() for each period received.
AudioInput example; disconnect from the built-in device when changing mode.
|
| |\ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
|
| | |\
| | | |
| | | |
| | | | |
into 4.6
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by:Dmytro Poplavskiy
|
|\ \ \ \ |
|
| |/ / / |
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
If I missed any, just set inAnotherDemo to true on the SameGame root
item.
Task-number: QTBUG-11562
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits)
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 )
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
VideoWidget example
Buildfix for MSVC2008 (C90 violation)
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607
Add skeleton changes files for 4.6.4.
Bump version number after 4.6.3 release.
Fixed unit test failure in qimagereader.
beautify tst_QLocalSocket::writeToClientAndDisconnect
QLocalSocket/Win: check for broken pipe in waitForReadyRead
QLocalSocket/Win: call close on async connection loss
Fix issues with thai line breaking
fix detection of header files
Prospective S60 build fix
Thread safety for QFontEngineS60
Allow to build Qt in static with mingw
Fix incorrect line breaking in QtWebKit.
QLocalSocket: don't emit readChannelFinished() twice on Windows
QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamed
QLocalSocket: fix reading from a socket after broken connection
...
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added file filters to videowidget and videographicsitem examples
to only allow supported file formats to be opened.
Task-number:QTBUG-702
Reviewed-by:Andrew den Exter
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Attribute change to allow inclusion of image files.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Attribute change to allow inclusion of image files.
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
Use native locale aware string comparison on Symbian.
Temporary fix for regression in QSslCertificate::fromPath()
doc: Added more DITA output to the XML generator
Fix symbian building of TARGET with a slash
Fix a minor typo in QAbstractItemModel's documentation.
QXmlSchema: allow usage of xsd:all
QSslSocket: fix build for MinGW and VS 2005
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
...
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (58 commits)
Fix a minor typo in QAbstractItemModel's documentation.
QXmlSchema: allow usage of xsd:all
QSslSocket: fix build for MinGW and VS 2005
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
Updated leading whitespace to make indentation more consistent
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
make postgresql support sensitive to PSQL_LIBS
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
integration
|
| | | |/ /
| | | | |
| | | | |
| | | | | |
* Add Japanese hellotr example
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Don't add if name or address is empty.
Reviewed-by: Alessandro Portale
|
|/ / / |
|
| | | |
|
| | | |
|
| | | |
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-11157
Reviewed-by: Warwick Allison
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix example code and image
Fix doc
Fix some bugs in the QML Web Browser buttons
Fix zoom bug in QML Web Browser demo
Fix Typo
Various doc fixes and improvements
Document issues with rectangle border width of 1 where clipping is used
Simplify selection setting. Make TextInput more like TextEdit.
|
| | | |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By making selectionStart/End read-only, and adding adding select().
Task-number: QTBUG-11056
|