| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
QDocconf files was out of date in the section including extra files
Style now shows numbered lists corectly
(cherry picked from commit cbba0a1ea1e727cca4ca09c216e4f5a306083ba4)
(cherry picked from commit 288e8a2cd4be9033af39fb5d309e855a582081bd)
|
|
|
|
| |
This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
(cherry picked from commit 78381dbc9701015aef43736fb7d22cf6e66984c7)
|
|
|
|
|
|
|
|
|
| |
i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.
Task-number: QTBUG-12379
Reviewed-by: Simon Hausmann
(cherry picked from commit b5b6cbb477b50c582d545b0e5e3a04626834e7e2)
|
|
|
|
| |
(cherry picked from commit 9986c3f0c0681c7ea8bc8e5cfea5662880db6654)
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
To-be-really-reviewed-by: Qt Doc Team
(cherry picked from commit 3833dc0a0535fa8320e17c741ca2746e9bebcaa9)
Conflicts:
tools/qdoc3/htmlgenerator.cpp
|
|
|
|
|
|
|
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-11938
(cherry picked from commit eea84818e98af917d3cf2bf04ea17a416ef9d55e)
Conflicts:
src/script/api/qscriptcontext.cpp
|
|
|
|
|
|
|
|
|
|
| |
Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the
QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the
QT_NAMESPACE=MyNamespace define for us.
Task-number: QTBUG-5221
Reviewed-by: ossi
(cherry picked from commit 83795c1348f879d6742b4ef20b2315e0055e45a6)
|
|
|
|
|
| |
Task-nr: QTBUG-13096
(cherry picked from commit 002c89aeb44c805d642be2d4e4a19422be877bc2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
|
|
|
|
| |
(cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)
|
|
|
|
| |
(cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)
|
|
|
|
|
|
| |
Flags allowed are now -creator and -online. -creator is
the default.
(cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)
|
|
|
|
| |
(cherry picked from commit 62968f33452016b31020e524fa6ba6d2cefd0278)
|
|
|
|
|
|
|
|
|
|
| |
The flags allowed on the command line are now:
-online (default), -base, -assistant (same as -base),
and -creator. If you don't specify one of these, you
see a warning in the error output telling you that it
didn't find an application flag and that it generated
online docs by defualt.
(cherry picked from commit d4dceca5dcd9252e09a421b65b318a7178049cd1)
|
|
|
|
| |
(cherry picked from commit a53b98f9269e6ee0b524fe7477e8fb46f189f9d3)
|
|
|
|
|
|
|
|
|
| |
These no longer do anything in qdocconf files:
online = false
offline = false
creator = true
(cherry picked from commit 7de8a0c487ce6a7f13c2028e93648807ef7d8e8b)
|
|
|
|
|
| |
Task-Nr: QTBUG-12278
(cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
|
|
|
|
|
|
|
|
|
| |
validating and adding some french translations.
Plus all the fixes from Gabriel's extensive review.
Doc: Fix a typo
Reviewed-by: gabi
(cherry picked from commit 209c017333fea9827fd20c7f8d23721bd8a6ee43)
|
|
|
|
|
| |
Reviewed-by: gabi
(cherry picked from commit 065cc163d7848131dcfd8bb210c8590b6cd11991)
|
|
|
|
|
| |
Task-Nr: QTBUG-12278
(cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
|
|
|
|
|
|
| |
Task-number: QTBUG-12029
Reviewed-by: Martin Jones
(cherry picked from commit 4692a507dcdfbc830a0885016b6bd0bab4480bad)
|
|
|
|
|
|
| |
Task-number: QTBUG-12485 QTBUG-12651
Reviewed-by: ck
(cherry picked from commit 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The interface numbers in /dev/serial/by-id are hex rather than decimal.
Also added code to read the manufacturer name and product name from string descriptors
in order to get a better match. Unfortunately, root privilege is needed or the API
returns an error.
In this case, we still use the weak matching on interface number only.
Task-Number: QTBUG-11794
Reviewed-By: Thomas Zander
(cherry picked from commit 767aa8d648bf81a3303da66a4fef98657ea5ece3)
|
|
|
|
| |
(cherry picked from commit b588cfe80741ec500fc0a52586145e5849ca5968)
|
| |
|
|
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
(cherry picked from commit 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe)
|
|
|
|
|
|
|
|
| |
Adds a startup animation for all platforms, and adds support for file
associated and drag and drop on Mac OS X
QTBUG-12496
(cherry picked from commit 688791b4d39ed4e96c43621e28c6bb3098d3b70c)
|
|
|
|
|
|
|
| |
The value for GIF must be "plugin" and not "yes".
Reviewed-by: danimo
(cherry picked from commit d8fbc4e0264f8bfabc12bc49ed7724eb2c96c93e)
|
|
|
|
|
|
|
|
| |
This reverts commit 453abe70fec02456aba2219025f5202060eaece1.
Task-number: QT-3583
Reviewed-by: Jason McDonald
|
|
|
|
| |
Reviewed-by: MArtin Jones
|
|
|
|
|
| |
Task-number: QTBUG-11512
(cherry picked from commit d8908922f339892fee4275a433e2bf6da87ae055)
|
|
|
|
| |
(cherry picked from commit e0a102ee171ddcebb1104d98d8a4ff4993e91c1d)
|
|
|
|
|
| |
Reviewed-By: Jason McDonald
(cherry picked from commit a545e26e1183133f4a66cb9a3bcd9051e2d77894)
|
|
|
|
|
| |
This reverts commit 7702be3de6e2641afb1062f533567ca7a72e8e0f as a
potential fix is now available.
|
|
|
|
|
| |
This reverts commit 74564a9b9f0f4e4ead8c3e38f72c24054b65f62a, which
breaks configure for Windows CE builds.
|
|
|
|
|
| |
Reviewed-by: Robert Griebl
(cherry picked from commit 30630cf2bf8c7604efc3a52f74983c2237f309c3)
|
|
|
|
| |
(cherry picked from commit bd9e495a025ff8d282d54e8909771c8760ebdb3f)
|
|
|
|
|
|
|
|
|
| |
don't have configure create the forwarding headers (or symlinks on unix)
for qconfig.h, but instead have syncqt create forwarding headers for
not yet existing files.
Reviewed-by: joerg
(cherry picked from commit 74d0482c1690211a20bdfc996aa0ad30fdb9bb28)
|
|
|
|
|
|
| |
Merge-request: 740
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585)
|
|
|
|
|
|
| |
Merge-request: 740
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 156193223ee9d58da66817ae6ffc0174bdf34e5b)
|
|
|
|
|
| |
Task-number: QTBUG-12157, QTBUG-12148, QTBUG-12146
(cherry picked from commit d3f67bfe7cd1cc39d25e6a7371b2b185591008c4)
|
|
|
|
| |
(cherry picked from commit 1d3aa6681423d7a39a8ed375448a9418ef33a1f5)
|
|
|
|
| |
(cherry picked from commit c50d351df3b7fe2f0d10444c1080b6a8c9833e0f)
|
|
|
|
|
|
|
| |
Adding a variable to the qdocconf file will now generate the docs in Creator format
Reviewed-by: Martin Smith
(cherry picked from commit e649d255bc3785c9af7c36e743ac204c8890137e)
|
|
|
|
| |
(cherry picked from commit bc16436e33cfc61e0009474186cbb8210fb51df7)
|
|
|
|
| |
(cherry picked from commit 25ace9513587abb5e52f78d900e6bec7b04bb663)
|
|
|
|
| |
(cherry picked from commit 5a6e3d952327753cb0cc00fa22804c5dab435c39)
|