summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 's60MainHelperClasses' into 4.6axis2009-09-2313-470/+527
|\
| * Corrected typo.axis2009-09-231-1/+1
| |
| * Added support for using custom application objects on S60.axis2009-09-2313-469/+526
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, the application developer can use his own CEikApplication, CEikDocument and CEikAppUi classes with Qt, by deriving from QS60MainApplication, QSMainDocument and QS60MainAppUi, respectively. He can then register a factory function in the QApplication constructor to have his own objects created during the framework initialization. This patch also fixes some Qt code style issues. RevBy: Jason Barron RevBy: mread RevBy: Sami Merila RevBy: Shane Kearns
* | Avoid calling ensureContext() in setGeometry.Jason Barron2009-09-231-1/+0
| | | | | | | | | | | | | | | | | | We can delay calling ensureContext() since it will happen when painting begins anyway. There is a chance that we can get to this function when a window is being hidden and if this is the first thing that happens in the application, there is no need to call ensureContext() yet. Reviewed-by: Rhys Weatherley
* | Small change in the API of animationsThierry Bastian2009-09-2311-30/+24
| | | | | | | | | | | | | | | | We're not taking a parameter in updateCurrentTime any more because that parameter was the total currenttime. So it was taking into account the currenttime and the currentloop at once. This was inconsistent Reviewed-by: Leo
* | QTextCursor selection extension when inserting charactersmae2009-09-231-2/+6
| | | | | | | | | | | | | | | | | | The change makes QTextCursor not extend the selection when inserting characters at the end of the selection, provided that the cursor position is at the end. Reviewed-by: Simon Hausmann Reviewed-by: Roberto Raggi
* | Added QSlider to tst_QStyleSheetStyle::complexWidgetFocus.Gabriel de Dietrich2009-09-232-7/+15
| | | | | | | | | | | | | | When using style sheets, QSlider::handle couldn't be customized if QSlider::groove wasn't. QComboBox::down-arrow:focus wasn't properly drawn. Reviewed-by: Olivier
* | When using style sheets, the focus flag was not propagated to the children ofGabriel de Dietrich2009-09-231-1/+1
| | | | | | | | | | | | complex widgets. Reviewed-by: Olivier
* | Modify functions for native pixmap data conversion on Symbian.Jason Barron2009-09-237-351/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | We need a way to support converion to and from multiple native pixmap types from multiple pixmap backends. Instead of adding more virtual functions to QPixmapData, make the existing one more generic but pass an opaque pointer and a type and do some internal casting. Currently this function is Symbian only, but could easily be extended to work on other platforms. Reviewed-by: Aleksandar Babic Reviewed-by: Jani Hautakangas
* | Implement advanced pointer handling on S60Bradley T. Hughes2009-09-233-2/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | Since we only get one pointer event at a time, we need to keep a list of all known touch points in QApplicationPrivate (otherwise the QTouchEvent won't contain enough points). The QApplication machinery can handle having inactive touch-points in the list, so at the moment we don't clear the list. We treat PointerNumber zero as the primary touch point, and only send regular mouse events for that pointer, never for the others. Reviewed-by: Jason Barron
* | Implement Qt::WA_AcceptTouchEvents on S60Bradley T. Hughes2009-09-233-1/+14
| | | | | | | | | | | | | | | | Turning this attribute ends up calling RWindow::EnabledAdvancedPointers(), which tells Symbian to send us multiple pointer events with extended info. Reviewed-by: Jason Barron
* | Fix a warning about an unused variable.Jason Barron2009-09-231-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Fixed parsing of html header in the qtextcodec.Denis Dzyubenko2009-09-231-6/+8
| | | | | | | | | | | | | | The QTextCodec::codecForHtml used to expect http-equiv attribute before the charset attribute in the meta header, which is not always the case. Reviewed-by: Simon Hausmann
* | Don't warn of an unused 'window' argument.Jan-Arve Sæther2009-09-231-0/+2
| |
* | Fall back to pixmaps in xp style when toplevel is translucentGunnar Sletta2009-09-231-1/+10
| | | | | | | | | | | | | | | | The "fast path" will write bad premlutiplied pixels into the backbuffer so the blending will be broken, plus that the window does not get mouse events for alpha=0 pixels. Reviewed-by: Marius Storm-Olsen
* | QRingBuffer: Try to minimize memory consumption while it is emptyMarkus Goetz2009-09-231-5/+18
| | | | | | | | | | | | | | | | | | Try not to hold an unused 4k QByteArray. This may introduce a performance regression e.g. for QNetworkReply in exchange for lower memory usage. We will see if this is really the case. Reviewed-by: Thiago
* | QNAM HTTP Code: Properly remove aborted requests from processingMarkus Goetz2009-09-234-4/+41
| | | | | | | | | | | | | | | | This fixes a crash that occured because aborted requests were not properly removed from the channel.alreadyPipelinedRequests. Task-number: QTBUG-4507 Reviewed-by: Peter Hartmann
* | Make gtkstyle work on non-developer machines againHarald Fernengel2009-09-231-1/+2
| | | | | | | | | | | | | | | | While refactoring gtkstyle in 4.6, the "0" .so suffix was dropped. This patch restores the 4.5 behavior to look for *.so.0 since the *.so is only available if you install the gtk developer packages. Reviewed-by: jbache
* | Merge branch 'QTBUG-3524' into 4.6Jan-Arve Sæther2009-09-232-0/+19
|\ \
| * | Small API addition: Make addChildLayoutItem available for subclasses.Jan-Arve Sæther2009-09-232-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Many people have requested this. And since its protected it does not really pollute the API a lot. Task: QTBUG-3524 Reviewed-by: mbm
* | | Added a comment to clarify the purpose of a piece of code.Trond Kjernåsen2009-09-231-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | QJpegImageHandle: Avoid smooth scalling when it should not.Olivier Goffart2009-09-231-1/+5
|/ / | | | | | | | | | | Task-number: QTBUG-3211 Task-number: 236875 Reviewed-by: Alex
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2339-200/+299
|\ \
| * | fix QApp::translate() callsOswald Buddenhagen2009-09-221-5/+5
| | | | | | | | | | | | Reviewed-By: Simon Hausmann
| * | don't crash in property access after script class has been set to 0Kent Hansen2009-09-222-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | When the script class is set to 0, we need to remove the script object's delegate entirely, because the delegate requires a non-0 script class in order to be useful. Reviewed-by: Olivier Goffart
| * | Fixed crash in QFileSystemWatcher for addPath(nonExistingFile)gunnar2009-09-221-0/+6
| | | | | | | | | | | | Reviewed-by: Eskil
| * | fix QPixmap::fromWinHICON for Windows CE mobileJoerg Bornemann2009-09-221-3/+20
| | | | | | | | | | | | | | | | | | On WinCE GetIconInfo returns a 0 hotspot for the system icons, thus we cannot use this value to determine width / height of the icon. Instead, we use the icon's bitmap to get this information.
| * | QPixMap::fromWinHICON compile fix for Windows CEJoerg Bornemann2009-09-221-11/+12
| | | | | | | | | | | | Reviewed-by: thartman
| * | Inverts the SortOrder in graphics scene to reflect the stacking orderLeonardo Sobral Cunha2009-09-228-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | Inverted all references of Qt::AscendingiOrder <-> Qt::DescendingOrder to make the order parameter consistent with the stacking order, as stated in the docs. The graphics scene index was using the wrong ordering convention. Reviewed-by: andreas
| * | make sure the engine's currentFrame is in sync when calling out to public APIKent Hansen2009-09-223-1/+32
| | | | | | | | | | | | | | | | | | | | | The currentFrame pointer is used e.g. by QScriptValue::toString(). It needs to be in sync, otherwise we will crash. Reviewed-by: Olivier Goffart
| * | Fixed background gradients in ObjectBoundingModeGunnar Sletta2009-09-221-2/+8
| | | | | | | | | | | | Reviewed-by: Samuel
| * | fix failing qdir autotestShane Kearns2009-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | File engine was adding '/' to the result of QDir::cleanPath(), which is correct for everything except root directories, where it caused a path like "c://" Reviewed-by: axis
| * | Fix crashes in QApplication autotestShane Kearns2009-09-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | 1) Input methods caused crash due to using CCoeEnv::Fep() without checking for NULL pointer 2) Autotest itself had Q_ASSERT where it should have used Q_VERIFY Reviewed-by: axis
| * | Fix "... may return wrong private dir if application is on Z:, not C:"Shane Kearns2009-09-221-32/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-805 QCoreApplication::applicationDirPath() may return wrong private dir if application is on Z:, not C: Remove the emulator ifdef, instead RFs::Drive is used to get the drive attributes (to see if it is ROM / read only) RFs::SystemDrive is used to get the system drive, which is C: on S60 phones, but in theory configurable. It is not needed to call Open() on RProcess to call functions on the current process - this eliminates some code. Elimated some unneeded code to check for Z: before creating prvate path (now, the if statement would always have evaluated the same) Task-number: QT-805 Reviewed-by: Miikka Heikkinen
| * | Doc: Moved the note about QFileSystemModel to the start of the document.David Boddie2009-09-221-4/+4
| | | | | | | | | | | | Reviewed-by: Alexis Ménard
| * | Fix focus scope bugs, verified against examples in kinetic-declarativeui.Andreas Aardal Hanssen2009-09-222-29/+18
| | | | | | | | | | | | | | | | | | | | | The C++ autotests have been updated to match the expected behavior of the examples that broke (e.g., listview.qml) in kinetic-declarativeui. Reviewed-by: Alexis
| * | Missing mouse release event on toolbars on Mac OS XPrasanth Ullattil2009-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | The mouse move events were eaten regardless of the dragging state. Task-number: 238004 Reviewed-by: Thierry
| * | Fix a regression in 4.6 in icon mode for QListViewThierry Bastian2009-09-221-1/+1
| | | | | | | | | | | | | | | | | | We were not restoring the hidden rows correctly. Reviewed-by: Jan-Arve
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-221-1/+1
| |\ \
| | * | work around another set of duplicated symbols between webkit and scriptLars Knoll2009-09-221-1/+1
| | |/ | | | | | | | | | | | | | | | jscyyerror/parse/lex where exported on some platforms. Reviewed-By: Simon Hausmann
| * | Fixed ellipsedrawing in raser engine for rects over 2^15 in sizeGunnar Sletta2009-09-221-0/+1
| |/ | | | | | | Reviewed-by: Samuel
| * Prevented export of some internal functions.axis2009-09-222-4/+4
| | | | | | | | | | | | These should not be exported anymore after commit c13b97f2. RevBy: Jason Barron
| * Fix a possible warning on animations used with statesThierry Bastian2009-09-221-7/+11
| | | | | | | | | | | | The problem is that sometimes timerevents get compressed. So in the unified timer, we need to make sure that some time has passed between 2 ticks.
| * Fix memleak in tst_qhttpnetworkconnectionMarkus Goetz2009-09-221-1/+3
| | | | | | | | Reviewed-by: TrustMe
| * QNetworkReplyImpl: Delete the outgoingDataBuffer in destructorMarkus Goetz2009-09-221-0/+2
| | | | | | | | | | | | Fixes a memleak Reviewed-by: Peter Hartmann
| * Saved some space by using bitfields instead of bools.axis2009-09-221-4/+4
| | | | | | | | RevBy: Shane Kearns
| * Fix breaking on fixed column width when text has tabsEskil Abrahamsen Blomfeldt2009-09-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | When a text in QTextLayout contained tabs, these would be counted as single glyphs when breaking the text on a fixed number of columns, rather than the number of characters they span. The patch calculates the number of characters represented by a tab by using the average character width of the font engine. Task-number: QTBUG-4468 Reviewed-by: Simon Hausmann
| * Fixed incorrect warning when unable to detect GTK themeJens Bache-Wiig2009-09-221-20/+25
| | | | | | | | | | | | | | | | | | If for some reason the theme name was not detectable, Qt would incorrectly print "QGtkStyle cannot be used together with the GTK_QT engine." I now added a separate "QGtkSTyle was unable to detect the current GTK+ theme." warning instead. Reviewed-by: Trust Me
| * Fix autotest failure on combo box with Gtk+Jens Bache-Wiig2009-09-221-2/+2
| | | | | | | | | | | | | | We were not respecting the rect offset on combo box arrows. This was preventing the autotest from happily completing with GTK+ style. Reviewed-by: joao
| * Fixed a warning.Trond Kjernåsen2009-09-221-0/+2
| | | | | | | | Reviewed-by: Kim