summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replaced the C++ code marker with the one from Qt Quarterly.David Boddie2011-01-181-248/+235
| | | | | More changes still need to be made to restore features from the old marker, including markup for links to classes and functions.
* Removed unnecessary markup escaping code.David Boddie2011-01-181-1/+1
| | | | There should be no need to escape markup at this point in the marker.
* Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-2110-25/+39
| | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
* Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
|
* Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
|
* Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
|
* Fixed handling of indented snippet markers.David Boddie2010-12-202-30/+27
| | | | Refactored the code to remove namespace macros and snippet markers.
* Removed obsolete configuration options.David Boddie2010-12-172-10/+0
|
* Updated the offline template to use a new offline style sheet.David Boddie2010-12-173-17/+672
|
* Doc: Fixed whitespace.David Boddie2010-12-171-61/+14
|
* Doc: Fixed broken links.David Boddie2010-12-173-12/+10
|
* Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1711-65/+171
|\
| * Merge branch 'mimir' into 4.7David Boddie2010-12-161-1/+2
| |\
| | * qdoc: Added typedef to help the OSX compiler accept a template.Martin Smith2010-12-161-1/+2
| | |
| | * Merge branch '4.7' into mimirDavid Boddie2010-12-15118-478/+1721
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-1610-64/+169
| |\ \ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-159-34/+118
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-151-3/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-151-3/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
| | | | | * | | Resize event for QDesktopWidget was sent too earlyMiikka Heikkinen2010-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some recent changes had caused a change in events sent from avkon to QSymbianControl, causing QDesktopWidget to be get resize event before the client area of application was correct. Moved the resize event sending from HandleStatusPaneSizeChange to HandleResourceChange (case KEikDynamicLayoutVariantSwitch). Task-number: QTBUG-16095 Reviewed-by: Sami Merila
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-151-11/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.
| | | | * | | | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use the qdrawhelper_sse.cpp or qdrawhelper_sse3dnow.cpp when SSE is not run-time detected, as those are compiled with -msse and MMXEXT is just a subset of SSE. The compiler might choose to use an instruction not in the subset, causing a crash at run-time. Task-number: QTBUG-15693 Reviewed-by: Thiago Macieira
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-152-4/+6
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add extra type of embedded license. Fix possible null pointer dereference.
| | | | * | | Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marketing needs this for commercial customers. Reviewed-by: Trust Me
| | | | * | | Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing a new connection an access point with the same SSID may not have been previously seen. Task-number: QTBUG-15276
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-153-12/+89
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Ensure that DBus is connected before all uses. Fix invalid configurations being added to bearermonitor list.
| | | | * | | Merge commit 'c9faf2defa9fa3209e44e8a5c1ae2da8e630d379' into maemo/199755Aaron McCarthy2010-12-153-12/+89
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In early system startup applications may try to use ICD before it is contactable. Ensure that the connection to ICD is established before all calls are made. If ICD is still not contactable QDBusServiceWatcher is used to monitor registration of the com.nokia.icd2 address and reconnection is attempted once ICD is started. Task-number: Maemo 199755
| | | | * | | Fix invalid configurations being added to bearermonitor list.Aaron McCarthy2010-12-151-1/+1
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-151-4/+7
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't delete FBO when resetting glyph cache
| | | | * | | Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the glyph cache is cleared because the max texture size has been exceeded, we shouldn't delete the fbo as this is only created in setContext() and will thus not be recreated. All subsequent resizing of the cache will fail. Task-number: QT-3971 Reviewed-by: Samuel
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-141-0/+13
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Trivial: Fix coding style Prevent ::flush from being called on QGLWindowSurface if no painting happened.
| | | | * | | | Trivial: Fix coding styleHarald Fernengel2010-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix coding style of merge request
| | | | * | | | Prevent ::flush from being called on QGLWindowSurface if no painting happened.Michael Dominic K2010-12-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2527 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Samuel Rødal
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-15105-3511/+2294
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added at the request of Peter Hartmann and Legal.
* | | | | | | | Whitespace fixes.David Boddie2010-12-172-554/+534
|/ / / / / / /
* | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-15118-478/+1721
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1428-85/+286
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-145-77/+35
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Docs: implications of creating network access managers in other threads Clarify that XmlListModel is read only Revert a fix made for bug QTBUG-15341
| | | * | | | Docs: implications of creating network access managers in other threadsBea Lam2010-12-141-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16032
| | | * | | | Clarify that XmlListModel is read onlyBea Lam2010-12-141-2/+2
| | | | | | |
| | | * | | | Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-143-55/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-1411-12/+157
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed a bug in the input methods on S60 with QGraphicsWebView. Fixed several compile and deployment issues in the mmf phonon plugin.
| | | * | | | Fixed a bug in the input methods on S60 with QGraphicsWebView.axis2010-12-143-3/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened because we did not expect to receive a call to CancelFepInlineEdit() when the widget had not previously been given any preedit text by S60. However, this can happen, and if it happens at the same time that there is a temporarily visible character in the widget (because it will be obscured as a password a second later), then the temporary character would be discarded. Fixed by checking in the beginning of CancelFepInlineEdit() whether we currently have any temporary preedit text or not, and if we do, we don't clear the contents, since it is the input context itself that generated the preedit text, not S60. Also made sure that the temporary preedit text is committed if we receive a call to UpdateFepInlineTextL(), which may sometimes happen without a call to StartFepInlineEditL(). Task: QT-4314 AutoTest: Included RevBy: Shane Kearns
| | | * | | | Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-148-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-142-3/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QApplication: fix crash exit whith native windows
| | | * | | | | QApplication: fix crash exit whith native windowsOlivier Goffart2010-12-142-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced in 8dd8db250d92521fda619bdcf3e1c859b37b2da0 Patch comes from the task Task-number: QTBUG-15774
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-145-7/+24
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: popup hides behind window Cocoa: combobox does not hightlight when mouse re-hovers the first item Cocoa: Fix addChildWindow bug where we connect a grandparent to a child Cocoa: cannot use staysOnTop flag for native file dialogs Cocoa: make sure stays on top child windows are not levelled down Cocoa: native child filedialogs sometimes shows non-native on screen
| | | * | | | | Cocoa: popup hides behind windowRichard Moe Gustavsen2010-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: when cocoa receives a mouse press/release in a window, it finds the correct view inside that window and sends the mouse event to it. But NSWindow also does some other stuff just before sending the event, like raise and lower windows. So when we override sendEvent, and more over, do not call [super sendEvent], we stop this raise/lower etc from working. So, to make this work again, I partially revert change 0b2eab87ad3bd73a0744469a45c29ca098649c9b Task-number: QTBUG-15638, QTBUG-1517 Reviewed-by: Fabien Freling
generated by cgit v0.12 at 2024-11-30 05:05:17 (GMT)