summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | * Fixed compile for wincewm60standard-msvc2008 (attempt 2)Rohan McGovern2010-01-221-3/+2
| | | |
| | | * Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+2
| | | |
| | | * Fixed compile.Rohan McGovern2010-01-221-1/+1
| | | |
| | | * Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+26
| | | | | | | | | | | | | | | | Includes partial revert of b4dd6ff29bc921ec81b4fd67ed44830e4d697d1d
| | | * Fixed compile when Qt is configured with -no-webkitRohan McGovern2010-01-221-2/+2
| | | |
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-106/+127
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | * build fix for mingwThierry Bastian2010-01-181-1/+9
| | | | |
| | | | * Build fix for MSVC2005 and older SDKThierry Bastian2010-01-183-31/+47
| | | | |
| | | | * QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2010-01-082-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain (cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
| | | | * Merge remote branch 'origin/master'Olivier Goffart2010-01-08451-5848/+18836
| | | | |\
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-162-44/+14
| | | | |\ \
| | | | | * | Character spacing when drawing a QPicture to a high DPI device.Trond Kjernåsen2009-11-131-40/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawing some text into a QPicture, and then drawing that QPicture to e.g. a QPrinter, would make the character spacing all wrong. The old approach that tried to fix this adjusted the DPI of the font that was used, so that the text size would be correct. It seems this is not enough, since it will lay out the text in the default resolution, and then scale that up, which may/may not introduce errors. Task-number: QTBUG-4974, 256481 Reviewed-by: Kim
| | | | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-1347-829/+1364
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
| | | | | * \ \ Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-11-13964-29397/+42871
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.6' of c:\dev\qt-graphics-4.6Gunnar Sletta2009-11-042234-57109/+96333
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| | | | * | | | | | Remove obsolete code for unsupported platformsBill King2009-12-162-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was apparently put in for OSX10.3. ODBC2 is over 10 years old now, and even microsoft doesn't support any fashion to link to the ansi versions of the functions. Remove the #define so that we don't have to support it any more. Reviewed-by: Justin McPherson
* | | | | | | | | | Support both gcc & g++ as a valid GCC compiler.Darin Broady2010-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 433 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | | | | | | | Add the ability for the SunStudio 8+ compilers to doDarin Broady2010-01-224-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ELF symbol visibility. Merge-request: 433 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | | | | | | | The declaration of qt_x11Data needs to be consistent across the headerDarin Broady2010-01-221-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the implementation file, and this includes it's visibility. This error and patch was found while attempting to get symbol visibility to work with the SunStudio compilers (coming later). I went with the visibility setting from the implementation file (qapplication_x11.cpp) because I don't know if this variables is used outside of libQtGui.so, especially in 3rd-party code. If it's not supposed to be used outside of libQtGui.so, then the proper change would be to remove the Q_GUI_EXPORT from the definition in qapplication_x11.cpp. Merge-request: 433 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | | | | | | QtHelp: Minor clean-ups.ck2010-01-222-7/+4
|/ / / / / / / /
* | | | | | | | Standard dialogs example does not respect non-native flagRichard Moe Gustavsen2010-01-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing a colordialog from the example, it does not check if the 'use native dialogs' checkbox is checked. This patch makes sure it does
* | | | | | | | Adding a warning if the property of an animation is not writableThierry Bastian2010-01-221-1/+3
| | | | | | | |
* | | | | | | | build fix for mingwThierry Bastian2010-01-221-1/+9
| | | | | | | |
* | | | | | | | Build fix for MSVC2005 and older SDKThierry Bastian2010-01-223-31/+47
| | | | | | | |
* | | | | | | | Assistant: Fix compliation for -no-webkit.ck2010-01-221-2/+5
|/ / / / / / /
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-2189-504/+1427
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2110-62/+107
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtHelp: Enable dynamic translation. Designer: Fixed a crash when previewing in a non-existent style. uic3: Introduced option to preserve layout object names of Designer 3.
| | * | | | | | | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7420 Reviewed-by: kh1
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-216-42/+44
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fixed a crash when previewing in a non-existent style. uic3: Introduced option to preserve layout object names of Designer 3.
| | | * | | | | | | Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7432 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| | | * | | | | | | uic3: Introduced option to preserve layout object names of Designer 3.Friedemann Kleint2010-01-215-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce options flag mask for better handling in UI3Reader. Pass on layout name. Task-number: QTBUG-7404 Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Initial-patch-by: Andy Shaw <andy.shaw@nokia.com>
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-212-0/+34
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Menubar and dock disappear after hiding a fullscreen widget on Cocoa. Changelog.
| | * | | | | | | | Menubar and dock disappear after hiding a fullscreen widget on Cocoa.Carlos Manuel Duclos Vergara2010-01-211-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here was exiting the full screen mode. In Cocoa we don't activate windows as we do in Carbon, therefore we were not exiting from the full screen mode. This patch adds a check when hiding a window, if the window is in full screen mode then we go through the list of top level windows checking if there are any other visible and not-minimized windows that are also in full screen mode. If none if found, the we exit the full screen mode. Task-number: QTBUG-7312 Reviewed-by: Prasanth
| | * | | | | | | | Changelog.Carlos Manuel Duclos Vergara2010-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding my changes to the changelog for 4.6.1.
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-211-3/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix semitransparent windows with DirectFB
| | * | | | | | | | Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This filling of the window surface is a bug. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-201-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed some earlier incorrect documentation fixes.
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-2099-467/+1202
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Doc: Fixed some earlier incorrect documentation fixes.David Boddie2010-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-207-11/+171
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: 1st attempt at USB serial port enumerator for linux Corrected alphabetic order in the docs for events. Implemented event filter functions for Symbian.
| | * | | | | | | | | | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enumerate the ACM ports which are created in /dev after plugging in the phone. Tested on Kubuntu (karmic koala), using 5800XM and N95. Linux has two USB drivers of interest. 1: CDC-ACM, this loads automatically, and creates /dev/ttyACM<n> for the USB modem interface 2: USBSERIAL, this needs to be loaded manually using modprobe, and creates /dev/ttyUSB<n> for each ACM interface on the phone The second ttyUSB port is the one we need, this enumerator does not pick the correct port yet. (1st port is ECACM:0, i.e. the modem, 2nd port is ECACM:1, i.e. the general purpose port used by TRK) according to lsusb, the 1st ACM descriptor has: class 2 (comms) subclass 2 (abstract - modem) protocol 1 (AT commands) 2nd ACM descriptor has: class 2 (comms) subclass 2 (abstract - modem) protocol 255 (vendor specific) Linux 2.6.33 RC3 has a hardcoded list of nokia phones in cdc-acm.c for which the protocol 255 ACM port will be recognised as a second ttyACM Task-number: QTBUG-7446 Reviewed-by: Miikka Heikkinen
| | * | | | | | | | | | Corrected alphabetic order in the docs for events.axis2010-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | | | | | Implemented event filter functions for Symbian.axis2010-01-202-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only the symbian specific event filters were called, but now all filters in QApplication, QAbstractEventDispatcher and QInputContext should be called. Task: QT-2629 RevBy: Jason Barron Autotest: Passed
| * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-208-18/+83
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::hasFocus() performance regression. Fix crashes in QByteArray Move the labels a bit down so that they align better vertically with the field. Add command to qmake to do symbian-uid generation Fixed QBitmap::load to load into bitmap format again. Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. Text drawing is not fast currently
| | * | | | | | | | | | QGraphicsItem::hasFocus() performance regression.Bjørn Erik Nilsen2010-01-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we always climbed the parent chain to look for a panel item (QGraphicsItem::isActive()) before checking the scene's focus item. Task-number: QTBUG-6749 Reviewed-by: alexis
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-201-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix crashes in QByteArrayOlivier Goffart2010-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QByteArray is was crashing on linux 64bit. The memory was freed twice, once by qRealloc, and one by QScopePointer::reset This patch will leak if qRealloc fails because of OutOfMemory. But we do not care as it is a corner case. Reviewed-by: Harald Fernengel Reviewed-by: Robert Griebl
generated by cgit v0.12 at 2025-02-12 00:07:38 (GMT)