| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
(cherry picked from commit 7f9205aa572c60085c9e9f38749bb48e707fea95)
|
|
|
|
| |
(cherry picked from commit a02eba0de0fcf9a17d489ee1f92977c95d3afd76)
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
(cherry picked from commit f33359fb0c56fe88e0ae3c564b7847f90889eac2)
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/external-resources.qdoc
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
Task-number: QTBUG-12355
(cherry picked from commit 3378fe13f8d865463c79f34017a1d82e03cdf147)
|
|
|
|
|
|
| |
Task-number: QTBUG-12791
Reviewed-by: David Laing
(cherry picked from commit 0d4d065cc9757159c5b6fa817892f5707bc1ecae)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In MainWindow::deleteItem, if there is arrow selected, we need to clean
up the items from this arrow. We need to delete them first so there is no
arrow in the list anymore when we calls removeArrows (which before,
deleted arrow that were possibly in the list, resulting in crashes)
Also avoid leak by giving parents to objects that needs it, and destroying items.
Reviewed-by: Geir Vattekar
Task-number: QTBUG-12753
(cherry picked from commit 5dedcd3c4cac993949295d109804a8f7cc3a5b0a)
|
|
|
|
| |
(cherry picked from commit a98af1c7f1bba3c791d08e76e4896e48ea6ea019)
|
|
|
|
|
| |
Task-number: QTBUG-12633
(cherry picked from commit dc2f700a006d827db0eaf8d1e01e4d9c7c8c0baa)
|
|
|
|
|
| |
Task-number: QTBUG-12378
Reviewed-by: Alex
|
|
|
|
|
|
|
|
|
|
|
|
| |
bearerName() -> bearerTypeName().
bearerName() is deprecated and converted into an inline function which
calls bearerTypeName(). This is required to keep existing code source
compatible between Qt Mobility 1.0.x and Qt 4.7.
Task-number: QTBUG-12378
Reviewed-by: Alex
(cherry picked from commit 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-12142
Reviewed-by: Warwick Allison
This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor),
portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as
Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now
works on Symbian, but it's hidden when orientation mode is set to auto-orientation.
Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously
it only updated values between portrait and landscape. If your application only supports landscape or portrait
modes, just don't react to the inverted orientations.
Added orientation example screenorientation under examples/declarative.
The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait
to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows,
Linux and Symbian^3.
(cherry picked from commit e62f266a7642e675e9d235a1f54a6b5746500d48)
|
|
|
|
|
|
| |
QTBUG-7071 and QTBUG-10173
(cherry picked from commit 14e17d5fe5f925a768aab9db9401e04bbaca224d)
|
|
|
|
|
|
|
| |
Missing check for null networkSession.
Task-number: QTBUG-12501
(cherry picked from commit 597a842d66dc04181bfd063863216acbb11ce3bc)
|
|
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
(cherry picked from commit 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe)
|
|
|
|
| |
(cherry picked from commit 9ea7bb34e4b41e1263acb8a175f61566046f9bf6)
|
|
|
|
|
| |
Task-number: QTBUG-12493
(cherry picked from commit 0ab3b6fea13aad50a70890925659158eb662df2e)
|
|
|
|
|
| |
Task-number: QTBUG-12469
(cherry picked from commit f3f50543beebc41c69ac3a3fb296275fab12b604)
|
|
|
|
|
|
|
|
|
|
| |
The configurations returned from QNetworkConfiguration::children() are
guaranteed to be in priority order. Ensure that this order is reflected
in the tree view.
Task-number: QTBUG-11678
RevBy: juhvu <qt-info@nokia.com>
(cherry picked from commit 88d721fa8d28519e98207ca0249ff057faef8af0)
|
|
|
|
|
|
| |
7ef45318255c5cf1f10508753c9a2c55fc2cb8c0
321bd8b7b54e34a983b1ba142af836cf3e153a66
(cherry picked from commit c16f0a839743af36b36aea9c35f0d5ddfda3d6ac)
|
|
|
|
| |
Reviewed-by: Martin Jones
|
|
|
|
| |
Reviewed-by: MArtin Jones
|
|
|
|
|
|
|
|
|
|
| |
The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.
Reviewed-by: Aaron Kennedy
(cherry picked from commit 21806ff0921641b4e4d9d39721ab4ebeae74dddc)
|
|
|
|
| |
(cherry picked from commit 07ebc9161263c04dc072b9fc2a922b9665cbe7be)
|
|
|
|
|
| |
Task-number: QTBUG-12292
(cherry picked from commit 6d8b3453b6b4b151c777ad541ab25ca6bacc7381)
|
|
|
|
|
| |
Task-number: QTBUG-10439
(cherry picked from commit 75db37022a9fd479e2a446b57e774eaf8e3e73ea)
|
|
|
|
|
| |
Replace the usages of Follows with Behaviors, update docs.
(cherry picked from commit b22a5e13003ff9f23b075284a1a1e0a6b0e46250)
|
|
|
|
| |
(cherry picked from commit 1ea53e6055a7c4e9677a5003725785ad503bb242)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QDeclarativeSpringAnimation is a replacement for
QDeclarativeSpringFollow. The idea is to remove the Follows
quickly.
Follows used to have an inSync property. In order to provide
an alternative mechanism, the commit also fixes the
running property for animations which are controlled by a
behavior. Previously running would always return false and
never change. Now running does change and indicates that the
animation is running indeed.
(cherry picked from commit cb406a116bf2237c743ac05882fb06927c70359c)
|
|
|
|
|
|
|
|
|
|
|
| |
synchronous loading of QImages. (QPixmaps can only be created in the
main thread so they will always be loaded synchronously).
This changes request() to requestImage() and adds requestPixmap()
for pixmap support.
Task-number: QTBUG-11989
(cherry picked from commit a258456bcb35ec4211751a702ea94a1881d82a07)
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits)
update qml.qch to version 4.7
Undefined is undefined, and now qml warns about it
Fix so window will resize with the root object (broken by
Avoid duplicate code for testing initial sizes
Remove an unnecessary connect() in TextInput
Ensure micro focus is updated in TextEdit and TextInput
Fix flow layout not taking into account whether it's width and height are implicit or not.
Avoid binding loop.
Ensure Loader item change listener is removed when Loader is destroyed
Adapt all qmlviewer testcases to the code changes in the actual viewer.
Stop QMLLauncher from crashing on exit on Mac when quitting app via the
VisualDataModel hasModelChildren role shadowed user roles.
Allow positioning of ListView items width sub-pixel precision.
Examples clean up
Docs
Improve appearance when scaling
Tweak Qt Demo Behaviour
forget to rename the moc include when renaming deviceorientation_maemo.cpp
fix namespace macros
fix QML Viewer resize modes
...
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Erik Verbruggen
|
|/
|
|
|
|
| |
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
...
|