summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Workaround a bug in QDirModel in tst_QDirModel::task196768_sortingOlivier Goffart2009-09-221-8/+5
| | | | | | | | | | | | | | The test was reported failing by pulse on many platform, but noone of us was able to reproduce it locally. The problem was that pulse runs the tests in a hidden dirrectory. And this exposed a bug in the QDirModel. We decided anyway that the bug was not worth fixing considered that QDirModel is kind of deprecated in favor of QFileSystemModel. (The bug is the one reported in task 255066) Reviewed-by: mbm Reviewed-by: Thierry
* Fix breaking on fixed column width when text has tabsEskil Abrahamsen Blomfeldt2009-09-222-2/+43
| | | | | | | | | | | | 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
* tst_qnetworkreply: Increased timeout of uploadPerformance()Markus Goetz2009-09-221-1/+1
|
* 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
* Make QDialog, and QTreeView test more robustOlivier Goffart2009-09-222-6/+10
|
* 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
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2243-234/+867
|\
| * 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 branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6Andreas Aardal Hanssen2009-09-221-0/+187
| |\
| | * Added helper script to import src/3rdparty/javascriptcoreSimon Hausmann2009-09-221-0/+187
| | | | | | | | | | | | | | | | | | Based on mkdist-webkit Reviewed-by: Kent Hansen
| * | Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-226-5/+196
| |\ \ | | |/ | |/| | | | | | | | | | 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-222-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * tst_windowsmobile: local include correctedJoerg Bornemann2009-09-221-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Added more tests for QTextCodec::codecForHtml()Stian Sandvik Thomassen2009-09-221-1/+8
| | |
| | * 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
| | * Add INSTALL file.Jason McDonald2009-09-211-0/+150
| | | | | | | | | | | | | | | | | | | | | | | | Previously a different version of this file was added to each source package. As the file is now the same for all source packages, it can be added to the repo. Reviewed-by: Trust Me
| * | 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-2215-75/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Don't run host tools autotests when Qt is cross compiled.Rohan McGovern2009-09-221-10/+10
| | | | | | | | | | | | Reviewed-by: mstormo
| * | Fix tst_QScriptEngine::throwErrorFromProcessEventsOlivier Goffart2009-09-223-3/+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
| * | Support for generating OPTION GCCE from QMAKE_CXXFLAGS.GCCEShane Kearns2009-09-222-4/+23
| | | | | | | | | | | | | | | | | | | | | Added GCCE as a compiler in SymbianMakefileGenerator::writeMmpFileCompilerOptionPart Task-number: QT-1163 Reviewed-by: axis
| * | Fix qmake pkg file generator to respect a drive specified for binariesShane Kearns2009-09-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target path for binaries (.path configuration) in the DEPLOYMENT section of a .pro file now works for binaries as well as for resources. Path on device is still forced to /sys/bin Default path is still !:/sys/bin This can be used to force a binary to be installed on system drive by setting the path to "c:/sys/bin" or "$:/sys/bin" (for S60 3.2+) Reviewed-by: Iain
| * | 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
* | | Generate mac refs in docs.Jason McDonald2009-09-222-0/+4
| | | | | | | | | | | | | | | | | | | | | Now that we don't make platform-specific source packages, we only have one version of the docs. These docs need to include all platforms. Reviewed-by: Trust Me
* | | Fix permissions on files in bin directory.Jason McDonald2009-09-223-0/+0
|/ / | | | | | | Reviewed-by: Trust Me
* | 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
* | Remove remaining instances of THISYEAR placeholder.Jason McDonald2009-09-223-4/+4
| | | | | | | | Reviewed-by: Trust Me
* | Remove distinction between different editions in docs.Jason McDonald2009-09-224-26/+5
| | | | | | | | | | | | | | We now generate only one set of docs, for the qt-everywhere package. Thus we no longer need to differentiate the different editions. Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-223-1/+15
|\ \
| * | Add reconnection option to the mysql driver.Bill King2009-09-222-0/+14
| | | | | | | | | | | | | | | | | | adds MYSQL_OPT_RECONNECT to the mysql driver options. Task-number: QTBUG-4510
| * | Make compileBill King2009-09-221-1/+1
| | |
* | | QMatrix4x4::mapVector() to transform by top-left 3x3Rhys Weatherley2009-09-223-1/+94
|/ / | | | | | | | | | | | | | | It is useful to be able to map direction vectors by the top-left 3x3 component of a 4x4 matrix, ignoring the translation and projection components. Reviewed-by: Sarah Smith
* | Revert "Resubmit support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-218-186/+25
| | | | | | | | This reverts commit 1b34feacef7a2d3ac005449a7cfbcb08a6bbf947.
* | Calculate scissor correctly in OpenVG engineRhys Weatherley2009-09-211-1/+1
| | | | | | | | Reviewed-by: trustme
* | fontconfig config.test requires freetype2Harald Fernengel2009-09-211-3/+3
| | | | | | | | | | | | | | when cross compiling, freetype2 include pathes were not used when compiling the fontconfig config.test. Fixed. Reviewed-by: Simon Hausmann
* | The firstTimeObserver is not released if the event loop is never runBenjamin Poulain2009-09-212-8/+11
| | | | | | | | | | | | | | Previously, the firstTimeObserver was released by the event loop. This do not work if the event loop is never run. This commit amend b0016ea9a6b225757e3ee06b50e8f7d05463ddf7.
* | Add some more debugging to this test.Rohan McGovern2009-09-211-1/+1
| |
* | Removing needless qWaits and replacing others with QTRY_VERIFYsJoão Abecasis2009-09-211-21/+30
| | | | | | | | For more dependable test results.
* | Letting the xmlpatternsvalidator tool properly handle relative pathsJoão Abecasis2009-09-211-45/+42
| | | | | | | | | | | | | | | | | | | | Since QXmlSchemaValidator resolves relative paths against the executable location, we use QUrl::fromLocalFile before passing them along. This is a more typical behavior for command-line applications and fixes the autotest. Reviewed-by: Frans Englich
* | Clean upJoão Abecasis2009-09-213-6/+0
| |
* | Fixing some compilation warnings in xml testsJoão Abecasis2009-09-213-3/+3
| | | | | | | | Reviewed-by: Peter Hartmann
* | CompilePaul Olav Tvete2009-09-211-1/+1
| | | | | | | | Reviewed-by: aportale