| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Many of the generators were unused.
The old QSA and Qt Script parsers were unused.
We no longer use DCF files for Qt Assistant.
We no longer generate Qt Jambi documentation, and qdoc3 was not used
for much of that process, making some of the relevant files obsolete.
|
| |
|
|
|
|
|
|
|
| |
Removed hard-coded style and script information.
Split .qdocconf files to help separate content and presentation.
Task-number: QTBUG-15208
|
|
|
|
|
| |
Apparently, these files are no longer used, being duplicates of
those in doc/src/template.
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: (131 commits)
Qml Debugging: Only enable if explicitly requested
Do not crash on Symbian
Revert "Work around bug causing qml apps to crash on Symbian 5.0 devices."
Work around bug causing qml apps to crash on Symbian 5.0 devices.
Fix patch_capabilities.pl script for explicit set of capabilities
Update license headers to release version.
Adjust the parent index for the itemsMoved call.
Workaround for QFileSystemWatcher regression
Cleanup changelog for 4.7.1.
My changes for 4.7.1
Update change log.
Revert "Don't define highp/mediump/lowp if desktop GL has them"
Avoid in-place convertion of images with multiple references
Add missing data for the autotest of in-place conversion for Pixmap
Fixes assert in QDeclarativeWebView
QGraphicsItem device coordinate cache unefficient in portrait mode
Fix minehunt execution from QtDemo
Ensure PathView updates positions when path changes.
Support device orientation in harmattan
Some 4.7.1 changes.
...
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Enable the remote debugging of QDeclarativeEngines only after
QDeclarativeDebugHelper::enableDebugging()
has been called.
Approved by 4.7 Program Team.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
(cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)
Conflicts:
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/eabi/QtDeclarativeu.def
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.
This patch adds an accessor function for the data to QtGui, and
the crash is gone.
Done-by: Kai Koehne
Reviewed-by: Kai Koehne
(cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1)
Conflicts:
src/declarative/debugger/qdeclarativedebugservice.cpp
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit 391e173a8915230205a93b6e0709762f75547772.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Disable QML debugging on the devices for now. A better fix will be
provided in the next release.
Task-number: QTBUG-14670
Reviewed-by: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Elftran command never got executed when explicit set of capabilities
was defined. No warning or error was printed either, making it rather
confusing for user.
Task-number: QTBUG-14730
Reviewed-by: Janne Koskinen
(cherry picked from commit f603ce9a960ee387ab10be1916da8ffd09305045)
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Not doing this causes the parent QModelIndexes to be out of sync with
the model.
The fix in fe350ca756df6392b3d0b7840351fccc89f9ef6f is extended to also
use adjusted indexes in the itemMove call.
Merge-request: 849
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 62dc9c9602987f4381481cc5642e3ea0782bb418)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Don't call removePath() when it was not added before.
Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
(cherry picked from commit f38e8394eae20f7290688629ab66720ebacd64c9)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit eb625b3112c241047e8d08146b63545165d33ebf)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
(cherry picked from commit 0b905d602ffb24b8cad4f09d84a5f762cc6a6603)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 976391c5ce2bbe3b992298e140bbbbc596ca756f)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.
Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
(cherry picked from commit 7cd0a90344d340f22b6b2d3afeef092dbaf2cd51)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The decoding from image reader was assuming the image reader do not
keep the image internally. This is not true for the GIF plugins because
the previous image can be used to compose the current image.
This was causing crash on ARM because the 16 bits color depth causes
the image memory to be reduce by half. When the plugin was accessing
the memory, it assumes the images has not changed and is on 32 bits.
This patch disable the in-place conversion if a detach is required.
Regular conversion is the correct solution in this case, and it can
also be made faster by converting while copying.
Reviewed-by: Andreas Kling
(cherry picked from commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image
which was not commited with the patch.
(cherry picked from commit f0c1f381af7d6338ded9f65d00ed54b1b9405ba9)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If QDeclarativeWebView was instantiated twice
an assert was triggered by QWebSettings::enablePersistentStorage();
This patch is crtical for tooling (Bauhaus)
Task-number: QTBUG-14278
Reviewed-by: Aaron Kennedy
(cherry picked from commit f532679ca11914b453e22342f2ae5e9f790ce47a)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Problem was that we always invalidated the cache whenever the item was
rotated. This is however not required for simple rotations such as
90, 180 and 270 degrees. This commit also removes the somewhat arbitrary
logic which takes the desktop size into account. We now use the viewport
size instead.
Auto test included.
Task-number: QT-3779
Reviewed-by: yoann
(cherry picked from commit e84ab1fee7f44a28ee82793f83b0b27d04d28c09)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14250
Reviewed-by: Martin Jones
(cherry picked from commit 695b54e671b55bd8103dee8b30ee76309dbd26c1)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes regression caused by optimization added in commit
35a51442ed21f58c06b21293eeb56e843251ee82.
Task-number: QTBUG-14239
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14137
Reviewed-by: Aaron Kennedy
(cherry picked from commit f9a8c4ec598a0070b9d2d861efe5ee69d5045a1f)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 72fd8399aa36395e41f497fff79842496d6f9b03)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 7d5afd371d634e35192ab27f65c6dc895f7bbb5c)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number:
Reviewed-by: Yann Bodson
(cherry picked from commit 753d366ced1a62a97d5207eb2708817efc35bc4d)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit ba698e20b32defcb0840293fc4ac5948f7c190c9)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 646c37a670b101487a76b1e787fd298187b49430)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 0ce33ebfa8b99c2988b56d0157ddc039a9ab06ae)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 8050dc45c8c9a134875196dcddf010d4194fd974)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 3519840ef2c5cb7cbc5b32ffc9976a8638187d64)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 99340cf858731f531af29be1e1368e4991e8564e)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit c1a9c50d53ae41b19bdcd7930eec0805498e01c6)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 583ca462caf656af17bea1c3f05d88ae7785ae91)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 2d1e3b9778328046d3ba94dd51c37c507e618721)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 2b70a3a6d5ebef36e90f52076c5d942d8cc171d7)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Frederik Gladhorn
(cherry picked from commit 02de74f0b2d443e410154e96321357cfe2ef9aad)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit fbf91dc787c15f561686cd708735ff8f45984aba)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit baa2d6bee64e458f547b290d7cd1acdfc6292e05)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit bed3d1eca213f24dae13cbd4cda4df94d9f0738b)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit f160e04ebe2926d09c20ef3960def1388a566db7)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 9c97aa4946a1d6b22bdcd8475f32b5ead7051976)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit f2be9f394972edffa0eebc9c30fe00a4fce81abc)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 77b9b5dc93662d505b2c69211d001e5672d8a2cb)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
pixel."
This reverts commit 2acdc634ee895af4a9738c0f6c2496e388afba38.
Originally this fixed QT-3791 but it caused lots of problems in
other sites. So reverting this will fix QT-4001 but reopens
QT-3791. QT-4001 blocks Qt 4.7.1 but QT-3791 doesn't.
Task-number: QT-4001
Reviewed-by: Jason Barron
(cherry picked from commit 25ddfb434f13aa3bbc6ac303aa17dbe9582bf3f0)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In portrait orientation, QDateEdit's calendar popup (QCalendarWidget)
does not fit into screen.
As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from
13 to 3 in qHD screens (640*360). Also, the explicit halving of
the pixel metric for QTableViews is removed.
The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for
calendar widgets, which is clearly a bit too much.
Task-number: QTBUG-14126
Reviewed-by: Miikka Heikkinen
(cherry picked from commit b3f895fd97deda0c7c5bfd704c04450e7afee748)
|
| | | | |
|