summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-071408-6773/+11528
|\ | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
| * Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-036-4/+130
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (29 commits) Fix for QTBUG-17035 Fix QMutex can deadlock when calling tryLock Carefull free the data from XGetWindowProperty on X11. Fixes memory leaks in QX11Embed Fixed missing text when using static text items in GL 2 engine. Prevent recursion when creating window surface. Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present. document that QThread::exit will exit future event loops Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop." Don't ignore source-text when generating qsTrId translations for QML Fix a crash when undoing form layout Fix generated mif file cleaning in symbian-abld Fix potential networking crash due to null-pointer dereference Fix typo in qglthreads auto test. Revert "Improve timer ID safety by using a serial counter per ID." Invalidate QScriptPrograms when engine is destroyed Fix alignment issue causing crash in QtScript/JavaScriptCore Orientation control implementation for Symbian Restore Qt 4.6 behaviour: exec() always enters the event loop. No longer replace dash and dot in TARGET with underscore in Symbian ...
| | * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-032-138/+93
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
| | | * Fix QMutex can deadlock when calling tryLockOlivier Goffart2011-02-021-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the unix code, if the QMutexPrivate::wait() with a timeout expires in the same moment that the mutex is released, wakeup would be set, but would be then ignored. (reset to false quickly after) If we waken up between the timeout and the re-aquisition of the internal mutex, we consider that the mutex has been locked. Reviewed-by: brad Task-number: QTBUG-16115
| | | * Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."Olivier Goffart2011-02-021-137/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2e72a8b19ea6c674fb4777860dac50faa5d387e6. The behavour in Qt 4.6 was wrong. And even if it was not documented, it is too late to change the behaviour back at this point. The tests for QEventLoop and QCoreApplication have not been reverted Reviewed-by: Brad
| | * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-022-0/+8
| | |\ \ | | | |/
| | | * Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-012-0/+8
| | | | | | | | | | | | | | | | Reviewed-by: ossi
| | * | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-024-59/+222
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix generated mif file cleaning in symbian-abld Fix potential networking crash due to null-pointer dereference Fix typo in qglthreads auto test. Revert "Improve timer ID safety by using a serial counter per ID." Invalidate QScriptPrograms when engine is destroyed Fix alignment issue causing crash in QtScript/JavaScriptCore Orientation control implementation for Symbian Restore Qt 4.6 behaviour: exec() always enters the event loop. No longer replace dash and dot in TARGET with underscore in Symbian Make syncqt not complain about missing header macros. Fix: define hotSpot for Gestures on Mac Fix warnings in PSQL driver: handle VersionUnknown in switch Fix warning in ODBC driver: passing NULL to non-pointer. QNAM FTP: switch to binary mode before sending a SIZE command Change the D-Bus signal filter to return NOT_YET_HANDLED for signals Check if the interpolators have already been deleted. Improve timer ID safety by using a serial counter per ID. QComboBox popup incorrectly opened in Sym^3
| | | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-59/+222
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-293-57/+220
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix potential networking crash due to null-pointer dereference Revert "Improve timer ID safety by using a serial counter per ID." Invalidate QScriptPrograms when engine is destroyed Fix alignment issue causing crash in QtScript/JavaScriptCore Restore Qt 4.6 behaviour: exec() always enters the event loop. Make syncqt not complain about missing header macros.
| | | | | * Restore Qt 4.6 behaviour: exec() always enters the event loop.Thiago Macieira2011-01-273-57/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 4.6 as well as 4.7's QCoreApplication and QEventLoop, calling exec() always enters the event loop, even if you had tried to quit()/exit() it before entering, with one exception (noted in the unit tests; this difference has been in Qt since at least Qt 4.2). Add unit tests to ensure all of the three classes have the same behaviour. Decide if we want to match the behaviours in Qt 4.8. Reviewed-by: Bradley T. Hughes
| | | | * | Fix typo in qglthreads auto test.Jani Hautakangas2011-01-281-1/+1
| | | | |/ | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | Split QScriptQObject test into smaller functionsKent Hansen2011-02-031-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could be split further (and with more descriptive names), but this is a start, at least. Task-number: QTBUG-16746 Reviewed-by: Jedrzej Nowacki
| * | | | Split QScriptEngine test into smaller functionsKent Hansen2011-02-031-327/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add comments to clarify what we're testing, and remove dependency on precise error messages (we don't care what the precise wording of an error is, only that it is e.g. a TypeError). Task-number: QTBUG-16746 Reviewed-by: Jedrzej Nowacki
| * | | | Split QScriptContext autotest into smaller functionsKent Hansen2011-02-031-136/+194
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16746 Reviewed-by: Jedrzej Nowacki
| * | | | Improve QScriptClass test coverageKent Hansen2011-02-031-1/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for various kinds of property access from JS. Add tests for null-engine & using the same script class in two different engines. Task-number: QTBUG-16746 Reviewed-by: Jedrzej Nowacki
| * | | | Bring back "classic" iteration order of QScriptClass propertiesKent Hansen2011-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old back-end, normal JS properties were iterated before QScriptClass properties. There wasn't any good reason to change that. Now we can get rid of that left-over XFAIL as well. Task-number: QTBUG-16746 Reviewed-by: Jedrzej Nowacki
| * | | | Split QScriptClass autotest into smaller functionsKent Hansen2011-02-031-210/+236
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-16746 Reviewed-by: Jedrzej Nowacki
| * | | Refactoring of tst_QScriptEngine::automaticSemicolonInsertion test.Jedrzej Nowacki2011-02-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Test shouldn't relay on error message, but on error type. Reviewed-by: Kent Hansen
| * | | Add new test to tst_QScriptContextInfo.Jedrzej Nowacki2011-02-011-0/+8
| |/ / | | | | | | | | | | | | | | | Test checks comparison between two null contexts. Reviewed-by: Kent Hansen
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-291-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Incorrect comparison result in QString::locale
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-281-0/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Incorrect comparison result in QString::locale
| | | * | Incorrect comparison result in QString::localeCarlos Manuel Duclos Vergara2011-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we are not able to set the locale in Symbian, therefore this test becomes unreliable since it depends on a particular locale being defined. We are disabling this test for now. Task-number: QTBUG-16921 Reviewed-by: Shane Kearns
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-01-281-0/+10
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.
| | * | | Merge remote branch 'qt-fire-review/master'aavit2011-01-281-0/+10
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made toHsl() work the same way as toHsv(), ensuring the hue gets set to USHRT_MAX and not 0. Task-number: QTBUG-16530 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | | Cocoa: fix qgraphicsview autotestRichard Moe Gustavsen2011-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the cursor to the corner of the desktop (0, 0) will typically trigger things to happend in the OS, at least on Mac (spaces, synergy etc). So I changed those tests to move it to (1, 1) instead. The reason to move it to (0, 0) was just to get the mouse away from the window anyway. And second, it takes some time after using QCursor::setPos on Mac before the events from the move actually arrive. And many tests that use this function relies on this. So I introduces a little delay. This alone will fix a couble of tests.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-stagingRichard Moe Gustavsen2011-01-2717-87/+400
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-273-60/+92
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-263-60/+92
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-263-60/+92
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | * | | \ \ \ Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-2715-87/+327
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (78 commits) Add util/xkbdatagen/README Application background is incorrect if app locked to landscape. QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" Temporary fix for ambiguous cast from four letter char constant add autotest for digest authentication Fix cursor position adjustment when removing strings Fix QMAKE_POST_LINK in Symbian for targets with special characters. QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate Avoid possible font name collisions on fbserv Update of Czech translation for Qt 4.7-stable Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication Fix loop count in animanted gifs sometimes being incorrect Fixed UTF-8 application names in device application menu in Symbian Validate arguments to QDBusConnection::connect make the test a bit stricter ignore the warning from auto-detach in destructor ...
| | | * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-262-10/+48
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-251-10/+20
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" add autotest for digest authentication QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
| | | | | * | | | add autotest for digest authenticationPeter Hartmann2011-01-251-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-15070
| | | | * | | | | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-0/+28
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed cursor position adjustment until the move operation is done, but contentsChanged will be triggered by finishEdit() in this move operation, thus cursor positions in this signal handler will be in inconsistent states (normally we should first update cursor position then trigger contentsChanged). In this case we should also postpone finishEdit() handling after cursor positions have been adjusted, then the states expose to applications will be consistent. Task-number: QTBUG-15857 Reviewed-by: Eskil
| | | * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-2513-77/+279
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| | | | * | | | make the test a bit stricterRitt Konstantin2011-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't say we passed the test if we didn't Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | | | * | | | ignore the warning from auto-detach in destructorRitt Konstantin2011-01-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we locked shm few line ago and didn't unlock it, so we expecting for this warning Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | | | * | | | BorderImage fails for .sci source containing a URLMartin Jones2011-01-212-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16769 Reviewed-by: Bea Lam
| | | | * | | | positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We positioned the view beyond the bounds, which in some cases resulted in only one item being created. Combined with a bug in the bounds fixup very many items were created. Task-number: QT-4441 Reviewed-by: Michael Brasser
| | | | * | | | Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-211-54/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768. QTBUG-16796 reports that this commit is causing regressions relating to initial sizing of items. Task-number: QTBUG-16796
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-192-1/+8
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use SRCDIR as a base path for the test data. Add the test data to the INSTALLS target
| | | | | * | | | Use SRCDIR as a base path for the test data.Lucian Varlan2011-01-192-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test cannot run on harmattan CI system, which executes it from a different directory than the one where the executable resides. Reviewed-by: Adrian Constantin Reviewed-by: Harald Fernengel
| | | | | * | | | Add the test data to the INSTALLS targetAdrian Constantin2011-01-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Lucian Varlan
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-191-0/+12
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Cleanup created views in TextEdit tests. TextEdit implicit size varied depending upon wrapMode.
| | | | | * | | | | Cleanup created views in TextEdit tests.Martin Jones2011-01-191-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-191-4/+0
| | | | |\ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Supporting Qt application fonts on Symbian
| | | | | * | | | | Supporting Qt application fonts on SymbianAlessandro Portale2011-01-191-4/+0
| | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch finally implements the missing application font support on Symbian. QFontDatabase's addApplicationFont[FromData], applicationFontFamilies and removeApplicationFont are now functional and allow an application to load, use and unload fonts at run-time. The underlying Symbian API comes with some restrictions/specialties. Most of them are worked around in this patch, the missing ones are left as part of QTBUG-16514: - The font file must be a file, not a memory buffer. Web fonts and qrc fonts come as memory buffers. These buffers are saved to a temporary .ttf file and the file is loaded by the underlying Symbian API. The temporary file can only be deleted after the font is unloaded. - The font file must be in a public location in order to be loadable by Symbian. It can for example not reside in the private application directory. Therefore, all application fonts (also those that are on the file system) become a temporary .ttf file in c:\temp\. - Symbian3/PR2 will come with a font table API which provides direct access to font tables. Symbian3/PR1 and below are missing this API, therefore, an own TFontStore is (ab)used to read font tables out of a font. This patch is considering both code paths in several occasions, making the Qt Symbian font implementation significantly less maintainable. - The fonts are loaded into Symbian's central font server. Loaded fonts from different processes can have colliding font typeface names (not file names) on that server. The server does not separate loaded fonts by their origin processes. Working around such collisions is part of QTBUG-16514. The number of fonts loadable at the same time by a Qt application is limited to the random value 5. Just to prevent abuse of the font server's memory. As usual, this patch was looked at by colleagues, and it was adjusted according to the feedback. But since the bus factor for the interaction of Qt's and Symbian's font systems is 1, I reviewed this patch, myself. Task-Number: QTBUG-6611 Autotest: tst_QFontDatabase::addAppFont
| | | | * | | | | stabilize qmake autotestRitt Konstantin2011-01-191-15/+8
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a systems with small packet windows, QProcess::readAllStandardError() might return a part of the string and the existing code adds an endl to it a bit later, causing a test failure. (I don't care about the '\r'-s here because of QString shall eat them anyways) Merge-request: 2546 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>