summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fixed text drawing in the GL2 engine after sub-pixel hinting was added.Trond Kjernåsen2009-09-223-19/+35
| | | | | | | | | | | | | | | | | | | | 1. The mono format was not handled at all. 2. We really, really wanted to use sub-pixel hinted glyphs even when they were not available. 3. The glyphFormat type in the FT font engine wasn't updated to reflect the correct system glyph type. Reviewed-by: Kim
| * Compile on all non-windows platformsEskil Abrahamsen Blomfeldt2009-09-221-0/+2
| | | | | | | | Function is only used from within Q_OS_WIN or Q_WS_WIN-blocks.
| * Make the test fail in a nicer way if it failsPaul Olav Tvete2009-09-221-7/+7
| | | | | | | | | | | | | | By default, waitForSignal() will block the entire test if it fails, adding 20 false autotest failures. Reviewed-by: TrustMe
* | Fix compile error in MEDIA_SERVER code.Jason McDonald2009-09-231-1/+1
|/ | | | Reviewed-by: Gareth Pethig
* Fixes some warning in headersOlivier Goffart2009-09-225-26/+26
| | | | | | | | | such as margins.h:90: warning: declaration of ???bottom??? shadows a member of _this_" 'a' stands for argument Reviewed-by: jbache
* Fixes warnings in QMapOlivier Goffart2009-09-221-5/+4
| | | | | | | | | | Get rid of the pages of warning you get when compiling code that uses QtConcurrent::map for instance. qmap.h:607: warning: dereferencing pointer 'y' does break strict-aliasing rules qmap.h:605: note: initialized from here Reviewed-by: Peter Hartmann
* Fix QScriptValue::strictlyEqualsSimon Hausmann2009-09-221-1/+8
| | | | | | | | strictlyEquals has to continue to work if one of the values has an engine and the other one doesn't. Use the other value's engine to construct a JSValue if possible and use JSC::JSValue::strictEqual. Reviewed-by: Kent Hansen
* Fix QScriptValue constructors without a QScriptEngineSimon Hausmann2009-09-221-36/+9
| | | | | | | Don't create JSC types as the conversion back to a string now requires an ExecState. Reviewed-by: Kent Hansen
* Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-222-3/+5
|\ | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreapplication.cpp tests/auto/windowsmobile/test/tst_windowsmobile.cpp
| * Cached clip path not cleared correctly for ancestor that clips to shapeAndrew Christian2009-09-221-2/+4
| | | | | | | | | | | | | | | | | | Fix QGraphicsItem to clear clip path for items with an ancestor that clips to shape. Added autotest to demonstrate clipping path problem. Merge-request: 810 Reviewed-by: Alexis Reviewed-by: Andreas
| * QCoreApplicationPrivate::appendApplicationPathToLibraryPaths WinCE fixJoerg Bornemann2009-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | On Windows CE the plugin path is likely to be the same as the application directory. That's why we must not compare app_location with the plugins path. The check app_libpaths->contains(app_location) should be enough. Autotest: tst_QApplication::libraryPaths Reviewed-by: thartman
* | Cleanup convertHIconToPixmap() & loadIconFromShell32()miniak2009-09-224-55/+44
| | | | | | | | | | | | | | | | Replace convertHIconToPixmap() by QPixmap::fromWinHICON() Move loadIconFromShell32() to qwindowsstyle.cpp Merge-request: 1570 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | * QPixmap: Add toWinHICON() & fromWinHICON() methodminiak2009-09-225-72/+80
| | | | | | | | | | | | | | | | | | | | Duplicate QPixmap <-> HICON conversion code removed from qwidget_win.cpp & qsystemtrayicon_win.cpp. Task-number: 218533 Merge-request: 1570 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Remove key accelerators from Softkeys and Menus in S60.Sami Merilä2009-09-222-23/+7
| | | | | | | | | | | | | | | | | | In S60 softkeys and menu items do not support key accelerators (i.e. CTRL+X). Therefore, removing the accelerator characters from both softkey and menu item texts. Related to task QT-1505 "Make Qt dialogs look native" Reviewed by Jason Barron
* | Fix tst_QScriptEngine::throwErrorFromProcessEventsOlivier Goffart2009-09-222-2/+3
| | | | | | | | | | | | | | | | | | | | The problem is that the interpreter did not check for exception while running the "while(true){}" loop, as it deduced that none of the generated opcode would possibly generate an exception. The solution is to force a check right after we come from a timeout. Reviewed-by: Kent Hansen
* | Resubmit support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-228-25/+186
| | | | | | | | | | | | | | The antialiasing is currently not gamma corrected and is disabled on OpenGL ES 2.0. Reviewed-by: Samuel
* | Move 3rdparty fonts into repository.Jason McDonald2009-09-2239-0/+986075
| | | | | | | | | | | | | | | | | | | | These fonts used to be added to the qt-embedded-linux source package by the packaging scripts. As we no longer make platform-specific source packages, these files now belong in the Qt repository from which they will be added to all source packages. Reviewed-by: Trust Me Acked-by: Thiago Macieira
generated by cgit v0.12 at 2024-11-08 00:48:13 (GMT)