| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
Fix build break in S60 5.0 environment
Skip softkeys update if application is not on foreground in Symbian
Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Rename qdeclarativescriptdebugging autotest directory
Create property cache in case of Component{} root
|
| |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Adding debug output for not supported gl features
Compile fix in network for ios
Make it possible to compile in a screen plugin name in QWS
Don't redefine EGL defines
Compile fixes in corelib for ios
Export IPHONEOS_DEPLOYMENT_TARGET from qmake
Adding arm armv6 and armv7 as valid archs for mac builds
reset certain global variables on deletion
Made tst_QWidget::repaintWhenChildDeleted() pass.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Adding debug output for not supported gl features
Compile fix in network for ios
Make it possible to compile in a screen plugin name in QWS
Don't redefine EGL defines
Compile fixes in corelib for ios
Export IPHONEOS_DEPLOYMENT_TARGET from qmake
Adding arm armv6 and armv7 as valid archs for mac builds
reset certain global variables on deletion
Made tst_QWidget::repaintWhenChildDeleted() pass.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
in the gl2 paintengine
Reviewed-by: Samuel
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jørgen Lind
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jørgen Lind
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jørgen Lind
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jørgen Lind
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qt_button_down needs to be reset to 0 if it
points to the widget being deleted.
Reviewed-by: Samuel
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Implement some missing functionality in QWidget::destroy().
(cherry picked from commit 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa)
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Rename qdeclarativescriptdebugging autotest directory
Create property cache in case of Component{} root
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
master-qml-staging
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Make sure no packets get 'lost' when they're arriving in one go through
the TCP/IP socket.
Reviewed-by: Christiaan Janssen
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | | | | | | |
| | | | | | | | |
master-qml-staging
|
| | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Rename qdeclarativescriptdebugging autotest directory
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b
Reviewed-by: kkoehne
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Align it with the other qdeclarativedebug* tests.
Change-Id: Idde1c0948daa10bf4cc893bcd08c99b5c743553a
|
| | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Create property cache in case of Component{} root
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4
Task-number: QTBUG-19354
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (82 commits)
Doc: Fixed spelling errors that were blocking the CI system.
Added missing license headers.
Added missing license headers.
Doc: Added missing license headers for documentation and examples.
qdoc: Fixed code to match comments in QML files. Fixed API types.
Doc: Speculative attempt to fix build breakage.
Doc: Fixed file name of a header file to use lower case characters.
Doc: Speculative attempt to fix build breakage.
Doc: Fixed file name of a header file to use lower case characters.
Doc: Fixed links.
Doc: Added a snippet to show how to test the Qt version.
Added an additional check to workaround an issue on Windows.
Doc: Fixed a scope test for maemo5 and made an error a warning instead.
converted to unix txt file
try to resolve CRLR problems
"TAB character in non-leading whitespace" fixed
* fixed trailing- and whitespaces
* "How To Learn Qt" is almost complete. Last section is missing * Several external and internal (Qt) web links added
Undo accidental breakage.
Doc: Added some more information about visited links in rich text.
...
|
| | |\ \ \ \ \ \ \
| | | | |_|_|_|_|/
| | | |/| | | | | |
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (1968 commits)
Doc: Fixed spelling errors that were blocking the CI system.
Added missing license headers.
DEF file updates for Symbian
QTBUG-19883 Adding top level TRAP for QThreads on Symbian
Added missing license headers.
Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
Fix alignment value not handled in ODF
Silence a compiler warning about unhandled enum in switch
Silence the "array out of bounds" warning in GCC 4.6.
Silence the callgrind warnings in our source code when using gcc 4.6
Create a function that merges the SSE common code
Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
Revert "Fix compilation of lrelease on Windows"
QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
Also test http proxy in the QTcpServer benchmark
Symbian QFileSystemWatcher: fix potential crash
Enable QTcpServer benchmark on symbian
Fix building the OpenVG graphicssystem on Linux with static libs
fix build on windows 7
Fix compilation of lrelease on Windows
...
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Case sensitivity problems strike again.
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Case sensitivity problems strike again.
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / / / |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-by: David Boddie
Original-patch-by: Friedemann Kleint
|
| | | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / / / |
|
| | | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
|