summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/4.7' into qtbug-12631Aaron McCarthy2010-08-043-23/+148
|\
| * new icons for cell and bt networks.Lorn Potter2010-08-031-20/+33
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-0375-566/+824
| |\ | | | | | | | | | | | | Conflicts: src/plugins/bearer/connman/qconnmanengine.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-0149-374/+951
| |\ \
| * | | add convience methods for getting ethernet service details.Lorn Potter2010-07-302-4/+110
| | | |
| * | | fix spellingLorn Potter2010-07-301-1/+1
| | | |
| * | | fix crashLorn Potter2010-07-301-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-3040-370/+410
| |\ \ \
| * | | | try harder to get cell nameLorn Potter2010-07-291-2/+8
| | | | |
* | | | | Fix deadlocks in ICD and NetworkManager engines.Aaron McCarthy2010-08-044-46/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that locks are not held when signals are emitted. Task-number: QTBUG-12631
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-0311-41/+113
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefcc
| * | | | Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36723> || Crash while uploading a PDF document on www.largefilesasap.com || || <https://webkit.org/b/40572> || [Qt] Stack overflow when converting navigator object to QVariant || || <https://webkit.org/b/43037> || [Qt] Incorrect input method hints ||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0336-439/+500
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Removed the unfinished sentence. Fix for QTBUG-10173. Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173 Unbreak QImage::rgbSwapped() for many image formats. Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa) Doc: Adding content to installation guide and fixing printing bugs Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget Made changes to qdoc to allow it to accept a "style level" flag Doc: Correcting bugs in the CSS Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. ...
| * | | | Unbreak QImage::rgbSwapped() for many image formats.Andreas Kling2010-08-031-41/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These formats had broken rgbSwapped() implementations: argb8565, argb6666, rgb555, argb8555, rgb444, argb4444 Reviewed-by: Benjamin Poulain
| * | | | Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)Prasanth Ullattil2010-08-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the NSKeyDown event won't have fully constructed string in the [NSEvent characters]. So we need to add a guard before accessing the elements of this NSString. Task-number: QTBUG-12474 Reviewed-by: Richard Moe Gustavsen
| * | | | Cocoa: Active QDockWidget does not stay on top of inactive QDockWidgetRichard Moe Gustavsen2010-08-033-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a window has several child windows, it was not be possible to click on a child window to make it stack in front of the other children. The reason is that cocoa held a fixed stacking order of the child windows (sub-windows). This patch will release, and then reestablish, the stacking order of the children upon acitvation. Task-number: QTBUG-11780 Reviewed-by: prasanth
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0332-395/+436
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | * | | | Return 'Unknown' bearer type name for unknown bearer type.Aaron McCarthy2010-08-032-2/+2
| | | | | |
| | * | | | Update def files.Aaron McCarthy2010-08-032-1/+5
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0230-394/+431
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | | * | | | Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-021-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our stringToCMap implementation for CoreText that bypasses the shaping needs to have basic support for font cascading / glyph substitution. We now use CTFontCreateForString to determine the substitute font for missing glyphs. Task-number: QTBUG-12411 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
| | | * | | | 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.
| | | * | | | | | 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-s60-public into ↵Qt Continuous Integration System2010-08-039-14/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed incorrect values for QSysInfo::symbianVersion(). Switched from using hardlinks to copies in Symbian building. Added SYMBIAN_VERSION variable to qmake. Moved the S60 version detection to the common symbian profile. Fixed circular dependency warning. Fixed rvct.h header inclusion on Symbian^3. Included libstdcppv5 support for the makefile build system. Prevented makefile build system from using platform provided paths. Fixed additional case differences between Gnupoc and Symbian^3.
| * \ \ \ \ \ \ Merge branch 'symbian3Patches' into 4.7-s60axis2010-08-039-14/+29
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fixed incorrect values for QSysInfo::symbianVersion().axis2010-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | | | | | Fixed circular dependency warning.axis2010-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-307-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
* | | | | | | | Fix Flickable.StopAtBounds behavior when content size < flickable sizeMartin Jones2010-08-031-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clip the content position to the beginning rather than the end, if both apply. Task-number: QTBUG-12573 Reviewed-by: Michael Brasser
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-0322-70/+198
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Limit the pixmap cache in space as well as in time.Aaron Kennedy2010-08-031-7/+26
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | QTBUG-12590
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-028-41/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QDesktopServices crashes when accessing the NULL X11 variable Revert "Fix the byte order in QImage::fill for 24bpp formats" Fix crash when setting font decorations on text drawn with QStaticText Fix tst_QPainter::drawImage_task258776 Fix the rendering of lines with the X11 paint engine Fix the byte order in QImage::fill for 24bpp formats QScript: remove JSC::JSLock QScript: document/obsolete things that does not work since the move to JSC
| | * | | | | | QDesktopServices crashes when accessing the NULL X11 variableHurewitz Kevin2010-08-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that QDesktopServices for X11 assumes that it will be used with a GUI application and may access the X11 variable. The X11 variable will be NULL if it has not been initialized by the QApplication initialization. Merge-request: 2442 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * | | | | | Revert "Fix the byte order in QImage::fill for 24bpp formats"Olivier Goffart2010-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change the behavior. (as it break tests like drawImage_task258776 and tst_QPainter::drawhelper_blend_color) The bug it fixes is not considered importent enough This reverts commit 121c5143f1002734ff7aa62785ff14e0e6612aae and d8c6ae24f94133828f4f1b536538e69c5e438202
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-08-021-11/+37
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-027-37/+34
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_QPainter::drawImage_task258776 Fix the rendering of lines with the X11 paint engine Fix the byte order in QImage::fill for 24bpp formats QScript: remove JSC::JSLock QScript: document/obsolete things that does not work since the move to JSC
| | * | | | | | | Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt has a run-time assert for implementing drawPolygon() in any subclass of QPaintEngine, which will be hit if set font decorations on the font used by QStaticText. Since we don't care about line decorations or any other shapes drawn in the QTextLayout, we simply leave the implementation empty. Reviewed-by: Gunnar
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-317-37/+34
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_QPainter::drawImage_task258776 Fix the rendering of lines with the X11 paint engine Fix the byte order in QImage::fill for 24bpp formats QScript: remove JSC::JSLock QScript: document/obsolete things that does not work since the move to JSC
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-317-37/+34
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_QPainter::drawImage_task258776 Fix the rendering of lines with the X11 paint engine Fix the byte order in QImage::fill for 24bpp formats QScript: remove JSC::JSLock QScript: document/obsolete things that does not work since the move to JSC
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-307-37/+34
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_QPainter::drawImage_task258776 Fix the rendering of lines with the X11 paint engine Fix the byte order in QImage::fill for 24bpp formats QScript: remove JSC::JSLock QScript: document/obsolete things that does not work since the move to JSC
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-297-37/+34
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the rendering of lines with the X11 paint engine Fix the byte order in QImage::fill for 24bpp formats QScript: remove JSC::JSLock QScript: document/obsolete things that does not work since the move to JSC
| | | | | | * | | | | Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-07-291-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the X11 paint engine, when rendering lines with float coordinates, the lines were one pixel off if the decimal was > 0.5. This fixes the WebKit bug https://bugs.webkit.org/show_bug.cgi?id=42248 Autotest by Yoann Lopes. Reviewed-by: Simon Hausmann Reviewed-by: Yoann Lopes Reviewed-by: Andreas Kling
| | | | | | * | | | | Fix the byte order in QImage::fill for 24bpp formatsJohn Brooks2010-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QImage::fill() was using BGR ordering for 24-bit formats, which is always incorrect as QImage does not support BGR. qrgb888 is the correct 24-bit helper class that does use the proper order. Merge-request: 2440 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
generated by cgit v0.12 at 2025-03-13 20:35:31 (GMT)