summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-021-2/+3
|\
| * Fixed potential infinite loop in QFileSystemWatcher on Mac.Denis Dzyubenko2010-08-021-2/+3
| | | | | | | | | | | | | | | | The patch provided by the customer just jumps to reading the next event fom the kqueue when an unexpected condition happens. Task-number: QTBUG-12533 Reviewed-by: Bradley T. Hughes
* | doc: Fixed many qdoc errors.Martin Smith2010-08-025-16/+79
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-021-11/+37
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0222-370/+318
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-0265-364/+827
| |\ \
| * | | Reference count items in VisualItemModel.Martin Jones2010-08-021-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The views expect the models to reference count and not destroy (or hide in the case of VisualItemModel) until there are no references. Task-number: QTBUG-12450 Reviewed-by: Michael Brasser
* | | | Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.Jerome Pasion2010-08-021-3/+2
| |_|/ |/| |
* | | Simplify network manager settings code.Aaron McCarthy2010-08-021-112/+46
| | | | | | | | | | | | | | | There is no need to iterate over the outer and inner map as they are not multi-maps.
* | | Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-0221-251/+253
| | | | | | | | | | | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* | | Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-022-9/+21
| |/ |/| | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3117-66/+241
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing image Mention scope of id uniqueness Update QML Documents example add license header doc: Add a note about QCoreApplication::applicationDirPath Add license header Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3017-66/+241
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing image Mention scope of id uniqueness Update QML Documents example add license header doc: Add a note about QCoreApplication::applicationDirPath Add license header Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3017-66/+241
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing image Mention scope of id uniqueness Update QML Documents example add license header doc: Add a note about QCoreApplication::applicationDirPath Add license header Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| | | * | Add missing imageBea Lam2010-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12529
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2917-65/+240
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-294-8/+18
| | | | |\
| | | | | * Document elements that are focus scopes.Yann Bodson2010-07-294-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12404
| | | | * | Add moving and flicking properties to PathViewMartin Jones2010-07-293-10/+124
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PathView handles its own mouse interaction, but lacked properties similar to those in Flickable to determine when it is stationary. This made it impossible to start an animation when the view stops moving, for example. Task-number: QTBUG-12497 Reviewed-by: Warwick Allison
| | | | * Remove use of shared NOTIFY signals in QGraphicsScaleMartin Jones2010-07-292-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-2979-31/+12977
| | | | |\
| | | | * | Remove use of shared NOTIFY signalsMartin Jones2010-07-2910-44/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-305-237/+301
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed a broken def file entry. Fixed key event handling on Symbian. Cleaned up old comments. Refactored the virtual mouse handling code into its own function. Removed static on a member that didn't have to be. Fixed a problem with dso dependencies.
| * | | | | Fixed a broken def file entry.axis2010-07-302-2/+2
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-293-235/+299
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed key event handling on Symbian. Cleaned up old comments. Refactored the virtual mouse handling code into its own function. Removed static on a member that didn't have to be. Fixed a problem with dso dependencies.
| | * | | | Fixed key event handling on Symbian.axis2010-07-292-55/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After looking at QTBUG-11338 and Qt's behavior, it became clear that we needed more state tracking in the key event handling code, to be able to handle all the different ways that we can get key events. This inspired having three states for each used scan code, instead of the old code, which only took the current scan code into account. This should make Symbian behave identically to Linux. Task: QTBUG-11338 AutoTest: N/A, platform specific code. There was lots of manual testing on 5800, N97 and N95. RevBy: Jason Barron
| | * | | | Cleaned up old comments.axis2010-07-291-12/+0
| | | | | |
| | * | | | Refactored the virtual mouse handling code into its own function.axis2010-07-292-171/+181
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | Removed static on a member that didn't have to be.axis2010-07-292-5/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | One step further towards no static data... RevBy: Trust me
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-3023-65/+393
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-3023-65/+393
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992
| | * | | | Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
| | | | | | | | | | | | | | | | | | | | | | | | Backported various crash fixes
* | | | | | QFileDialog crashes when empty selectedFilter is set on Carbon.Prasanth Ullattil2010-07-301-3/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were making the wrong assumption that the selectedFilter string will be valid always, when calling functions like getSaveFileName(). Task-number: QTBUG-12461 Reviewed-by: Denis
* | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-293-3/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb ) Workaround for QTBUG-8013: Do not return an ascent of 0 Fix crash when all the items in a QListView are hidden Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window One more .pro fix for deprecated INCPATH Fix Rhys' qmake warnings Fixed QVideoSurfaceFormat::isValid()
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-293-3/+11
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb ) Workaround for QTBUG-8013: Do not return an ascent of 0 Fix crash when all the items in a QListView are hidden Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window One more .pro fix for deprecated INCPATH Fix Rhys' qmake warnings Fixed QVideoSurfaceFormat::isValid()
| | * | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-293-3/+11
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/itemviews/qlistview.cpp tests/auto/qlistview/tst_qlistview.cpp tests/auto/qnetworkreply/test/test.pro tests/auto/qsocks5socketengine/qsocks5socketengine.pro
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-284-20/+47
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-274-20/+47
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
| | | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-07-274-20/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-07-27 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. [Qt] Incorrect input method hints https://bugs.webkit.org/show_bug.cgi?id=43037 Properly set or reset all input method hints when activating input fields. * WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::setInputMethodState): * tests/qwebview/tst_qwebview.cpp: (tst_QWebView::focusInputTypes): Extended unit test to verify that we reset hints.
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-271-1/+6
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash when all the items in a QListView are hidden
| | | | * | | Fix crash when all the items in a QListView are hiddenGabriel de Dietrich2010-07-271-1/+6
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QIconModeViewBase::initDynamicLayout() on the second and successive segments would return QPoint(-1,-1), resulting in a totally empty area rectangle for all the items while in QIconModeViewBase::doDynamicLayout(). This rectangle is used to initialize the BSP tree, and produces an arithmetic exception when empty. Furthermore, a rendering bug was also apparent when displaying the first item of a segment while the last item of the previous segment was hidden. Auto-tests included. Reviewed-by: Olivier Task-number: QTBUG-12308
| | | * | | Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-07-271-1/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian's CFont::FontMaxAscent() returns in some cases an incorrect value of 0. That usually happens (for some font sizes) if a stroke based font is the main system font. We were able to reproduce it on some S60 3.2 devices with a chinese language pack installed. This patch will test if CFont::FontMaxAscent() returns 0. And if so, it alculates an ascent taht makes more sense. Task-number: QTBUG-8013 Reviewed-by: Liang Qi
| | | * | Ensure backing store is deleted before top-level windowGareth Stockwell2010-07-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this is not done, later deletion of the backing store may cause a crash. If the backing store is an EGL surface, its destruction includes a call to eglDestroySurface(), which triggers an exception if the window handle passed as a parameter is no longer valid. Task-number: QTBUG-10643 Task-number: QTBUG-11376 Reviewed-by: Jason Barron
| | | * | Fixed QVideoSurfaceFormat::isValid()Dmytro Poplavskiy2010-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial fix, valid formats have pixel format != Invalid, not ==. Task-number: QTBUG-12337 Reviewed-by: Andrew den Exter
* | | | | Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-2918-31/+31
| | | | | | | | | | | | | | | | | | | | QTBUG-11938 and QTBUG-10801
* | | | | Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-294-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Fix compilation with QT_NO_XMLSTREAMREADERTasuku Suzuki2010-07-293-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 757 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Fix compilation - disable TextInput when QT_NO_LINEEDIT is definedTasuku Suzuki2010-07-294-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 739 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | fixes for using freetdsMark Brand2010-07-292-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DBNTWIN32 only if not Q_USE_SYBASE. Workaround for RETCODE typedef conflict between ODBC and FreeTDS. Include winsock2.h supplies SOCKET for FreeTDS. Merge-request: 684 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Added *_location variables to pkg-config files for rcc, lupdate and lreleaseDavid García Garzón2010-07-291-1/+13
|/ / / / | | | | | | | | | | | | | | | | Task-number: QTBUG-11546 Reviewed-by: ossi
generated by cgit v0.12 at 2025-01-28 17:49:54 (GMT)