summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1311-21/+15
|\ | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| * Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | qmake - add targets to wrapper make file make stub_sis createpackage - use -s or --stub to run makesis with the -s argument also copies the file to the right place in epoc32\data\system\installs qt.iby - add qt_stub.sis and qt_webkit_stub.sis Task-number: QTBUG-6570 Reviewed-by: Miikka Heikkinen
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-123-11/+8
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix to S60 softkeys when no active Qt window or native widget is shown.
| | * Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys need to be updated also when Qt activewindow is set to NULL, this is needed that usecase where last Qt widget is closed works correctly. I.e. closed widget softkeys has to be removed, and replaced by default "Exit" softkey. Earlier only window activation or widget focusIn event caused softkey update. In addition IsDisplayingMenuOrDialog does not work correctly under all circumstances. Sometimes when menu is being launched the Qt gets focusChanged event before the menu is actually shown, but menu CBA is already created. This is fixed by checking that we update CBA only when AppUi CB is the current one. This assumption works as long as Qt uses only the CBA created by S60 application framwork and does not create other CEikButtonGroupContainer instances. Task-number: QTBUG-6115 Reviewed-by: Sami Merila
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
| |\ \
| | * | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| | | |
| * | | doc: Fixed several typos.Martin Smith2010-02-123-5/+5
| |/ / | | | | | | | | | Task: QTBUG-7997
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1265-221/+553
|\ \ \ | |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-112-13/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again QNAM HTTP: Optimize detectPipeliningSupport() QNAM HTTP: Set channel to IdleState at better place
| | * | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ↵Simon Hausmann2010-02-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit with THUMB again This restores the library size and memory consumption. Reviewed-by: Janne Koskinen Reviewed-by: Iain
| | * | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Do cheap checks first. Reviewed-by: TrustMe
| | * | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The readyRead() from the expand() function called from allDone() had a new request triggered for that channel even if it is not really finished yet. Move the assignment to IdleState inside allDone to avoid this error. Reviewed-by: Andreas Kling Reviewed-by: Peter Hartmann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-112-5/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: We need to export qBadAlloc() on all platforms
| | * We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This supports the (documented) case when mixing Qt built without exception support with code that was built against Qt with exception support. Reviewed-by: Robert Griebl
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-111-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QXmlSchema: fix crash in schema parser
| | * QXmlSchema: fix crash in schema parserPeter Hartmann2010-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | previously, annotations were only supposed to appear within elements of the form <element name="..."> ; However, they can also appear in elements of the form <element ref="foo:bar"> Patch-by: Tobias König <tokoe@kde.org>
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-113-2/+103
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update Symbian DEF files
| | * | Update Symbian DEF filesIain2010-02-103-2/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reserve ordinal numbers in the WINSCW DEF file for EGL exports from QtGui (now added, but marked as ABSENT) Update OpenVG DEF files for EABI and WINSCW Update QtGui DEF file for WINSCW with 2 non-EGL-related exports Reviewed-by: TrustMe
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-112-27/+21
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Export a function to get dfb-surface from a pixmap
| | * | Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| | | | | | | | | | | | | | | | This reverts commit 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb.
| | * | Export a function to get dfb-surface from a pixmapAnders Bakken2010-02-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is only exported when DirectFB is built as part of libQtGui. 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-02-1016-4/+60
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Take into account the solaris-cc-64-stlport mkspec Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
| | * | Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's PLATFORM(SYMBIAN) in 4.x, not OS() like in the trunk Reviewed-by: Trust me
| | * | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.Prasanth Ullattil2010-02-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blinking cursors drawn in positions other than zero, can become 2 pixel wide. This is caused by a rendering bug in the paint engine used by Cocoa. If a fillRect() is called in a nox pixel boundary this engine draws them 2 pixels wide instead of one. So make sure this is always on a pixel boundary. Task-number: QTBUG-8100 Reviewed-by: Trond
| | * | Fixed compilation with QT_NO_WHEELEVENTDenis Dzyubenko2010-02-1011-1/+36
| | | | | | | | | | | | | | | | Reviewed-by: Prasanth
| | * | Take into account the solaris-cc-64-stlport mkspecPierre Rossi2010-02-101-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-103-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ( ffae5e11181a3961193fa21ea405851cad714d4b ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=34170 -- [Qt] Javascript undefined > 0 returns true on Symbian
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-102-18/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: License update as requested by legal for file relicensed from S60. Make compile Removed dependency to moc.exe from Symbian builds
| | * | License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| | | | | | | | | | | | | | | | Rev-By: TrustMe
| | * | Make compileThomas Zander2010-02-101-1/+1
| | | | | | | | | | | | | | | | Reviewed-By: Alessandro Portale
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-1025-108/+235
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits) Fixed usage of QGLPixelBuffer with share widgets on other X11 screens. Fixed drawing QPixmaps on QGLWidgets on different X11 screens. Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support. Prevented assert when using drop shadow effect in the GL 2 engine. Clarify QFont::rawName() docs. Stabilize QListView test on Mac (ODBC) Use wchar_t instead of assuming 2 bytes. Fixed some global QIcon/QPixmap instances that leaked handles on X11. Speed up QListView test QListView: fix crash when hiding many of the lasts item in a QListView Fixed warnings and crash when painting graphics effects outside scene. Stabilize QLineEdit test on X11 (sqlite) Allow shared cache mode Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. ...
| | * | | Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.Trond Kjernåsen2010-02-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to share the internal pbo context with a widget context, the pbo context needs to be created on the same X11 screen as the widget context. Task-number: QTBUG-8047 Reviewed-by: Kim
| | * | | Fixed drawing QPixmaps on QGLWidgets on different X11 screens.Trond Kjernåsen2010-02-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to use the texture_from_pixmap extension when drawing a pixmap from one X11 screen onto a different X11 screen in the GL 2 engine. For that to work, the pixmap will have to be re-created on the new screen, which is exactly what the default bind method does (via QImage conversion). Task-number: QTBUG-8054 Reviewed-by: Kim
| | * | | Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support.Trond Kjernåsen2010-02-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8032 Reviewed-by: Kim
| | * | | Prevented assert when using drop shadow effect in the GL 2 engine.Samuel Rødal2010-02-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GL 2 pixmap filter uses Indexed8 images in the drop shadow case. Reviewed-by: Tom Cooksey
| | * | | Clarify QFont::rawName() docs.Trond Kjernåsen2010-02-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: related to QTBUG-8038 Reviewed-by: Kim
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-1021-103/+214
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (ODBC) Use wchar_t instead of assuming 2 bytes. Fixed some global QIcon/QPixmap instances that leaked handles on X11. Speed up QListView test QListView: fix crash when hiding many of the lasts item in a QListView Fixed warnings and crash when painting graphics effects outside scene. Stabilize QLineEdit test on X11 (sqlite) Allow shared cache mode Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant. Fixed bug where GL widget was not fully updated on Vista.
| | | * | (ODBC) Use wchar_t instead of assuming 2 bytes.Bill King2010-02-101-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some platforms, especially iODBC, wchar_t is a 32bit value, not 16 Task-number: QTBUG-6928
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-0920-93/+187
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed some global QIcon/QPixmap instances that leaked handles on X11. Speed up QListView test QListView: fix crash when hiding many of the lasts item in a QListView Fixed warnings and crash when painting graphics effects outside scene. Stabilize QLineEdit test on X11 (sqlite) Allow shared cache mode Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant. Fixed bug where GL widget was not fully updated on Vista.
| | | | * \ Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Kim Motoyoshi Kalland2010-02-095-14/+24
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| | | | | * | Fixed bug where GL widget was not fully updated on Vista.Kim Motoyoshi Kalland2010-02-045-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were cases where the QGLWidget would not be fully updated on screen on Windows Vista and Windows 7 with Aero disabled. Task-number: QTBUG-7865 Reviewed-by: Prasanth
| | | | * | | Fixed some global QIcon/QPixmap instances that leaked handles on X11.Trond Kjernåsen2010-02-094-27/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never ever create global cache objects that deletes QPixmaps when destructed! Task-number: QTBUG-8046 Reviewed-by: Friedemann Kleint
| | | | * | | QListView: fix crash when hiding many of the lasts item in a QListViewOlivier Goffart2010-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 6c1388ee5a3c4796d hidden items are not taken in account when counting the scrollbar position, and so the vector may be smaller. Reviewed-by: Gabriel Task-number: QTBUG-7929
| | | | * | | Fixed warnings and crash when painting graphics effects outside scene.Yoann Lopes2010-02-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when an item had a QGraphicsEffect on itself and that item was outside of the sceneRect, the cached pixmap of the item was just an empty pixmap (when using DeviceCoordinates mode). Therefore the effect filter was trying to paint into an unformatted and empty image. Now, paint() for all pixmap filters just return immediatly when the pixmap is empty. Task-number: QTBUG-5358 Reviewed-by: sroedal
| | | | * | | (sqlite) Allow shared cache modeBill King2010-02-092-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modification is needed to allow performance optimisations necessary for QML. Reviewed-by: Warwick Allison
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-087-23/+82
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| | | | | * | | Updated the docs for QPainter::begin/endNativePainting()Trond Kjernåsen2010-02-081-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7661 Reviewed-by: Kim
| | | | | * | | Add a pixmap modification hook to blur pixmap filter cacheTom Cooksey2010-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We probably want to kick out filtered pixmaps from the cache when the source pixmap is modified as well as just destroyed. Reviewed-By: Samuel
| | | | | * | | Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.Trond Kjernåsen2010-02-081-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the compiled in formats where checked when setAutoDetectImageFormat(false) was set on a QImageReader object. Task-number: QTBUG-7980 Reviewed-by: aavit
| | | | | * | | QLineEdit: regression: read-only line edits would eat shortcuts.Olivier Goffart2010-02-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore Qt 4.5 behaviour. Task-number: QTBUG-7395 Reviewed-by: Thierry
generated by cgit v0.12 at 2024-11-07 11:15:21 (GMT)