summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | My changelog for 4.6.2Yoann Lopes2010-02-061-0/+2
| | | | | | | | | | | | | | | | (cherry picked from commit db82dda4ae3672844f7637394bf9a403e7c4f4b3)
| | * | My Changelog entries for 4.6.2Markus Goetz2010-02-061-2/+15
| | | | | | | | | | | | | | | | (cherry picked from commit b52e4ac1dfcce317872d9104142c026951a29145)
| | * | Add some entries to the change logJason McDonald2010-02-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 88a3be84f9a1cb235a8e3a9b25df7763646166b6) Conflicts: dist/changes-4.6.2
| | * | Change log updatedPrasanth Ullattil2010-02-061-1/+4
| | | | | | | | | | | | | | | | (cherry picked from commit 92638ff2f459a8f7151385a192317e9ec91d9e66)
| | * | Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one ↵Olivier Goffart2010-02-064-102/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | horizontal scrollbar" This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d. This shown to cause more problem than it solved Also update the changelog Reviewed-by: Thierry (cherry picked from commit d53315d30b38352db11063096ee3867a40bdc234)
| | * | Update changes-4.6.2.Samuel Rødal2010-02-061-0/+4
| | | | | | | | | | | | | | | | (cherry picked from commit 7d4ef9167249df5f00831dc07e57705eb1ddd22a)
| | * | 4.6.2 changesJason McDonald2010-02-061-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 85578c6c37d9e4eb0da888937b20ba93a26d8805) Conflicts: dist/changes-4.6.2
| | * | My changes for 4.6.2Miikka Heikkinen2010-02-061-0/+18
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit 96a169ac3f235433906d58ac0e4c613f51c21bf3)
| | * | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-061-2/+7
| | | | | | | | | | | | | | | | (cherry picked from commit 264f4451667e7da90e63cf87a2b4a6eb72a14d3b)
| | * | Updated my changelog entryDenis Dzyubenko2010-02-061-3/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme (cherry picked from commit a9ffa944f8599db0559e9d07509a3778f49bbc2a)
| | * | Adding my changes.Carlos Manuel Duclos Vergara2010-02-061-1/+4
| | | | | | | | | | | | | | | | (cherry picked from commit d5a3866d20507967e14ed34930f08ce6248000e5)
| | * | Add changes for 4.6.2Anders Bakken2010-02-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly DirectFB. Reviewed-by: TrustMe (cherry picked from commit bcd979230af769b49a1e3fdb1c9e1103ce2348de)
| | * | Changelog: Added Designer/uic3 changes for 4.6.2Friedemann Kleint2010-02-061-1/+6
| | | | | | | | | | | | | | | | (cherry picked from commit 0f92406252b9d288ef8ebbefc15e66d0ce01f46c)
| | * | Updated changlog 4.6.2Kurt Korbatits2010-02-061-0/+6
| | | | | | | | | | | | | | | | | | | | Added bug 7044 to log. (cherry picked from commit 89377dc65ea505de568bb7243396ae260f435438)
| | * | Implemented QGifHandler::imageCount().Trond Kjernåsen2010-02-063-1/+241
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7514 Reviewed-by: Kim (cherry picked from commit 94b3918fb52858064811c4993dac6392d0043b24)
| | * | Assert failure when setting a widget focus proxy as its successor in tab orderGabriel de Dietrich2010-02-062-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we check that and skip it from the tab list. Auto-test included. Reviewed-by: leo Task-number: QTBUG-7532 (cherry picked from commit 94f5f21ac88de0d940d6ac27d222f1ef8e66d939)
| | * | Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-02-0612-67/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes quite a lot of issues: * QtOpenGL only registered qpixmap destruction hooks on X11 and those only cleanup the EGL/GLX surface, not the texture object. * The QPixmap destruction hooks were only being called from the QPixmap destructor. However, this means when a QPixmap is assigned to another QPixmap, the hooks don't get called. Task-number: QTBUG-7647 Reviewed-By: Samuel Reviewed-By: Trond (cherry picked from commit 9e95ce2a68ef167e17dccc5789cbf3bf74712280)
| | * | QStyleSheetStyle: Fix combinaison of border-image and border-radiusOlivier Goffart2010-02-062-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression since b4d642e639eabde5d72a4 Task-number: QTBUG-7737 Reviewed-by: Gabriel (cherry picked from commit cc585886ba9da17064a7fc858f5d717967da6e85)
| | * | Fixed a crash when QPixmaps are destroyed after the ~QApplication.Trond Kjernåsen2010-02-062-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying QPixmaps after the QApp destructor will leak native pixmap objects on X11, and it's a general rule that all GUI objects must be destroyed before the QApp destuctor is called. Task-number: QTBUG-7746 Reviewed-by: Kim (cherry picked from commit 4a5e81f5320daa82352b13e670718998b0d2d23b)
| | * | remove the rounded extra frame around the main message editorOswald Buddenhagen2010-02-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for one, it just added visual noise. second, it did not respect the color scheme, which made it unusable with light-on-dark colors. Task-number: QTBUG-7778 (cherry picked from commit b0e4af35ec8ddb5e7bfa658f916fbf29caa5a550)
| | * | Fixed missing textures in the boxes demo.Kim Motoyoshi Kalland2010-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The boxes demo assumed that the current GL colour was the default white, but the GL2 paint engine set it to black. Fixed by resetting the colour to white in resetGLState(). Task-number: QTBUG-7779 Reviewed-by: Trond (cherry picked from commit 787824cb4add4d45a0e90fd736a54e75fa048475)
| | * | Fixed garbled 3D Qt logo in the overpainting example.Kim Motoyoshi Kalland2010-02-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable vertex attribute arrays in the GL2 paint engine when calling QPainter::beginNativePainting() and QPainter::end(). Task-number: QTBUG-7781 Reviewed-by: Trond (cherry picked from commit afe0f17eb5974adbedd1bc1f2fcd98459d92df47)
| | * | QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.Bjørn Erik Nilsen2010-02-063-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QPainter::setClipPath results in complex (and slow) alphamasking so this must be avoided if possible. Task-number: QTBUG-7790 Reviewed-by: samuel (cherry picked from commit 80e114ad0b7974894858a17153d6f54546835066)
| | * | Optimize single-rect IntersectClip in OpenVG using the scissorRhys Weatherley2010-02-061-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7791 Reviewed-by: Sarah Smith (cherry picked from commit 1677382148ed9e8d037d03a6fcc7bbe40458d69a)
| | * | Avoids a possible crash when saving the state of a main windowThierry Bastian2010-02-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash could appear when saving the state of the main window in response to the visibilityChanged of the dock widgets. Task-number: QTBUG-7838 Reviewed-by: ogoffart (cherry picked from commit 3d2dbeb65089efaff4b92b7d13c13c1a234f71b0)
| | * | Use OpenVG scissor on 90/180/270 rotations and simple clips.Rhys Weatherley2010-02-061-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7864 Reviewed-by: Sarah Smith (cherry picked from commit 4c84020bd1c049ce82e0deb77196829616b91f4a)
| | * | Fixed casual crash in initializeDb (Symbian)Alessandro Portale2010-02-061-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic_cast should be used carefully with rvct before version 4. We found that out after the a dynamic (down)-cast from CFont* to CFbsFont* in QtGui suddenly failed. We test for (TypeUid() == KCFbsFontUid), before doing the cast. So, a static_cast is safe in this case. Also the other two dynamic_casts in qfontdatabase_s60.cpp were changed to static_cast. http://bugreports.qt.nokia.com/browse/QTBUG-7963 Task-number: QTBUG-7963 Reviewed-by: lars modified: src/gui/text/qfontdatabase_s60.cpp (cherry picked from commit 3b7164b3188e9382510bef2211e82ef777faa75c)
| | * | Remove unneeded resources from QtGuiAlessandro Portale2010-02-053-4/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui contains loads of resources. 337,160 bytes just for qstyle. And since this is nearly exclusively full of PNG files, it won't really be compressed in the qt.sis package. And it will eat unneccessary Ram. This patch removes about 260,000 bytes of resources. We only want the 32-pixel big icons. No 16- and 129- pixel versions. Task-number: QTBUG-7277 Reviewed-by: Sami Merila modified: src/gui/kernel/qapplication.cpp new file: src/gui/styles/qstyle_s60.qrc modified: src/gui/styles/styles.pri (cherry picked from commit 9eea7172d4d4984a111f009a60f5eaa0568fcf89)
| | * | Doc: Correcting imageMorten Engvoldsen2010-02-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing "Trolltech" to "Nokia" Task-number:QTBUG-7370 Reviewed-by:Trust me (cherry picked from commit 5160af692fd0352457cdf12cb497e1b8d8eed858)
| | * | Fixed the location where bootstrap.sis is looked for.Miikka Heikkinen2010-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7908 Reviewed-by: TrustMe (cherry picked from commit 07d81d0e0f15f015c7436992a99ef4b1ec36ae1c)
| | * | Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-057-61/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smart installer packages bundle normal application sis with a bootstrap package that will download a smart installer when the package is installed. Smart installer in turn will download any dependencies of the application that are available on remote server, such as Open C, Qt, and QtWebkit packages, and install them Smart installer packages are generated when DEPLOYMENT.installer_header variable is defined in applicatoin .pro file. This commit is still missing properly signed bootstrap.sis package. Task-number: QTBUG-7908 Reviewed-by: Shane Kearns (cherry picked from commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976)
| | * | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This give the possibility to get the file name with the extension and without the path. Reviewed-by: Joao Reviewed-by: Marius Storm-Olsen (cherry picked from commit 4c8b2aa00acc00a95b6f950a4ab7de737631e494)
| | * | Fixed compile of framecapture, simpleselector for symbian-abld winscw.Rohan McGovern2010-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | `QT += network' is required to find the network headers. (cherry picked from commit 0db6060e54d8d5862ae0b7ffa4d3c187d30fd159)
| | * | Fixed an endless loop if printing web pages.Trond Kjernåsen2010-02-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entering a page range which is valid, but outside of the printable range would result in an infinite loop. Task-number: QTBUG-6051 Reviewed-by: Simon Hausmann (cherry picked from commit 7c2000060bbc152ae32594f3d4dd60bd3351dab0)
| | * | Webkit: Fix missing namespace.ck2010-02-051-0/+2
| | | | | | | | | | | | | | | | (cherry picked from commit 0a9edf7a672b4a30b817439ad67a0e08e3670e8f)
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-054-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f ) Changes in WebKit/qt since the last update: (cherry picked from commit 5c8be23e6b5fa732f4c799c783a8b22a85992211)
| | * | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-041-1/+21
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme (cherry picked from commit 4b059682ddba4a1fb90c656d7d829680779a2e60)
| | * | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Error strings are now part of the Phonon::MMF namespace. Reviewed-by: trustme (cherry picked from commit 14ee2007fd2ada46e5fe30af838f5a7fcb7c6f4d)
| | * | Deployed QtMultimedia.dll on SymbianGareth Stockwell2010-02-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2813 Reviewed-by: trustme (cherry picked from commit a70a97cceccced13429b88f99373650d39da2f75)
| | * | Implementation for QVGPixmapData to/fromSymbianCFbsBitmapJani Hautakangas2010-02-043-5/+136
| | | | | | | | | | | | | | | | | | | | functions. (cherry picked from commit 0c73b18d0750bee9da4b88de595aa6093b5be820)
| | * | Adjust rw base address for gui built with GCCE for Symbian OSIain2010-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed during merge to match new style flag setting. Reviewed-by: Janne Koskinen (cherry picked from commit afae62256897a8ed14e3156df33838082c6d4b98)
| | * | Add visibility-inlines-hidden for GCCE on Symbian OSIain2010-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: axis (cherry picked from commit b5298dcf3d29b253a31974762cc9227b25f94e93)
| | * | Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.Bastian Bense2010-02-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the "(QGraphicsSceneDragDropEvent)" behind the documentation of the QGraphicsSceneDrag*-type events. Without this hint it gives the impression that you can't access the data being dragged within eventFilter()s. Task-number: QTBUG-7547 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> (cherry picked from commit 48d040b3536dbce06f54c90da489a5308bee3870)
| | * | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-0413-183/+727
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented features: Softkey Merging: Widget can set only one softkey and set flag that rest of the softkeys shall be taken from parent. Priority Handling: If multiple sokftkeys with same role are set, the highest priority action gets displayed. Custom Softkey Menu: By setting QMenu to QAction and assigning a softkey role for that action, the native menubar will be displayed when sofkey is clicked. Softkey Image: Initial code for implementing sofkey image support, the final implementation is still pending legal acceptance to use eiksoftkeyimage.h header file which is under EPL license. Task-number: QTBUG-7315 Review-By: Sami Merila Review-By: Jason Barron (cherry picked from commit 2a8d20453926082062246fc4cc788f88ea3c59ae)
| | * | Fixed potential crash in mac styleJens Bache-Wiig2010-02-031-3/+5
| | | | | | | | | | | | | | | | (cherry picked from commit 7ced77b654eb46af1221a55e315795c1be1753a0)
| | * | Fix missing non-unified toolbar margins on MacJens Bache-Wiig2010-02-031-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tool bar appearance have regressed in 4.6 for applications that do not utilize the unified tool bar appearance. This fix restores the margin and spacing to their 4.5 appearance. Task-number: QTBUG-7831 Reviewed-by: morten (cherry picked from commit e4835d58381cd33fe067b05bfd6301d2246e3e67)
| | * | Added support for ifdeffing for manufacturer in generated pkg filesMiikka Heikkinen2010-02-032-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEPLOYMENT.manufacturers variable can be used to define manufacturer identifiers. DEPLOYMENT.manufacturers.fail_note variable can be used to define a file that contains the text to be shown in case of failed manufacturer check. Task-number: QTBUG-7695 Reviewed-by: Janne Koskinen (cherry picked from commit 08c1c9ef6f30706cd574eded656f4d65a1b18db5)
| | * | Fixed no-timeout case for QProcess::waitForFinished in SymbianMiikka Heikkinen2010-02-031-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QProcess::waitForFinished was panicking in Symbian when timeout of -1 was supplied. Fixed it to disable timeout and block until process exit, as docs indicate it should. Task-number: QTBUG-7667 Reviewed-by: Janne Anttila (cherry picked from commit e63ea3587444e122242a137a699b5a717d3d26bd)
| | * | Fixed text rendering via scaled QPainter on rasterPaintEngine / SymbianAlessandro Portale2010-02-033-19/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text rendering in Qt for Symbian looks very bad on a scaled QPainter. Instead of simply using a Symbian font with the right size it followed the code path that is usually used for "tricky transformation": Use the glyph outlines and rasterize them in Qt as QPainterPath. That's slow and especially ugly on Symbian since we do not (yet) get the glyph outlines from Symbian. This patch adds QFontEngineS60::setFontScale() so that QFontEngineS60 has one additional native font handle with the scaled size. The raster paint engine will call that function in case that the painter is scaled. Since we already have QFontEngineS60 specific code in the raster paint engine, this patch did not have to add #ifdefs. http://bugreports.qt.nokia.com/browse/QTBUG-7614 Task-number: QTBUG-7614 Reviewed-by: Jason Barron modified: gui/painting/qpaintengine_raster.cpp modified: gui/text/qfontengine_s60.cpp modified: gui/text/qfontengine_s60_p.h (cherry picked from commit 5a64033f89e07505bb77d3c172597b8df3cbd762)
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( a733444d3be6605552471f047558927495ff62b7 ) Changes in WebKit/qt since the last update: Fix up cherry-pick of backup restoration fix (cherry picked from commit 54de7595a54e67efb60cdc9eb4c4ff15596c3763)
generated by cgit v0.12 at 2025-02-18 04:21:58 (GMT)