summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Eliminate reference to Trolltech.Jason McDonald2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19653 Change-Id: If3c822dd59ccbdd03037068acfe902ed9688a874 Reviewed-on: http://codereview.qt.nokia.com/2482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | * test: skip some tst_qtextscriptengine tests when fonts are missingRohan McGovern2011-08-022-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest may fail depending on the version of fonts which are installed on the system. It has no way to verify if the correct fonts are installed, and it's unclear from where the correct version of the fonts may be obtained. Therefore, disable the test by default unless the user has indicated that they have a correct setup by setting QT_HAVE_TEST_FONTS=1. Task-number: QTBUG-20682 Change-Id: I24174520f54af6a9b2c13c9c1347f46555bce3d4 Reviewed-on: http://codereview.qt.nokia.com/2469 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| | * Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry-picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: If180d2b826879d6d02c7be4d3075917815ccf349 Reviewed-on: http://codereview.qt.nokia.com/2435 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| | * test: remove CONFIG+=insignificant_test for tst_qgraphicstransformRohan McGovern2011-08-022-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest failure is stable, so it should be marked with QEXPECT_FAIL, not CONFIG+=insignificant_test. Note that the test row naming had to be changed, as the test previously created many rows of testdata with the same name, making it impossible to skip only the broken rows. Task-number: QTBUG-20661 Change-Id: Ie38f5dddafe7686e30eaa8ff3445310935d2cd9a Reviewed-on: http://codereview.qt.nokia.com/2419 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * test: fixed failure of tst_qiconRohan McGovern2011-08-022-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test unconditionally assumed that SVG support was available. This is an invalid circular dependency: the test is in qtbase and depends on qtsvg, which depends on qtbase. Change the test so that it uses SVG support only if available. Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495 Reviewed-on: http://codereview.qt.nokia.com/2426 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| | * test: fixed crash of tst_qdialog and removed CONFIG+=insignificant_testRohan McGovern2011-08-022-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test assumed that C++ exceptions could always be caught by the event loop. This is not the case when the Glib event loop is used. Skip the relevant portion of the test in that case. Change-Id: I6a6325c3590c810a5aba28ec98279581dcfaf55c Reviewed-on: http://codereview.qt.nokia.com/2455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * test: improved stability of tst_qiodevice on slow machinesRohan McGovern2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Increased network timeout from 5 to 30 seconds. Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0 Reviewed-on: http://codereview.qt.nokia.com/2456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * test: fixed tst_qimagereader and removed CONFIG+=insignificant_testRohan McGovern2011-08-022-180/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test assumed that Qt's available image formats could be determined at compile time. This was never correct since the image formats are loaded from plugins at runtime; in Qt5 it became a real problem since one image format (svg) was moved out of qtbase into a separate module, turning this into a circular dependency: this test in qtbase depends on qtsvg, which depends on qtbase. Always check the image formats at runtime instead. Change-Id: I5e770c5b11276c39910e34f232a2fea0a7abaa8c Reviewed-on: http://codereview.qt.nokia.com/2457 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * test: improved stability of tst_qwaitconditionRohan McGovern2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased thread wait timeout from 3 to 10 milliseconds, for slower or heavily loaded machines. (There was a previous attempt to improve stability of this test some time ago by increasing the timeout from 1 to 3 milliseconds.) Note that this increases the runtime of the wakeOne test from ~5 to ~14 seconds. Change-Id: Ib556d4c949a6989fe71c11f5dc10feb2ec45c512 Reviewed-on: http://codereview.qt.nokia.com/2458 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * test: fixed tst_qmessagebox and removed CONFIG+=insignificant_testRohan McGovern2011-08-022-85/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some binary compatibility tests written specifically to test a change introduced between Qt 4.1 and 4.2. Qt 4 and 5 are not binary compatible, the test no longer makes sense. Change-Id: I3e8f9b6011105e504c20bedad51af8193b102552 Reviewed-on: http://codereview.qt.nokia.com/2464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * test: fixed spelling errors in tst_qtextscriptengineRohan McGovern2011-08-021-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | couln't -> couldn't Change-Id: I37e86ecea74db1114fcfac93423388fae81df63d Reviewed-on: http://codereview.qt.nokia.com/2465 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * test: replace CONFIG+=insignificant_test with QEXPECT_FAIL for tst_qftpRohan McGovern2011-08-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest failure is entirely stable, so QEXPECT_FAIL should be used instead of insignificant_test. Task-number: QTBUG-20687 Change-Id: I0444e725b436fe93d30cbe54edc673594ca9b9fe Reviewed-on: http://codereview.qt.nokia.com/2486 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * test: fixed tst_qfilesystemmodel and removed insignificant_testRohan McGovern2011-08-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qfilesystemmodel::sort uses some internal API to affect the sorting behavior. This means that part of the test must be disabled when private symbols aren't available. Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c Reviewed-on: http://codereview.qt.nokia.com/2413 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * Fixed tst_qprocess, tst_qtcpserver when crashing is slowRohan McGovern2011-08-012-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests assumed that a crashing program will always exit within five seconds. This is not true in some situations. On our test macs, enabling crash dumps can easily cause a process to take longer than five seconds to crash. Increased the timeout to 30 seconds. Change-Id: Ifca240ac8d3da1346f33110653ac47de6ba2ab81 Reviewed-on: http://codereview.qt.nokia.com/2407 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * Fix tst_qgraphicsview::task255529_transformationAnchorMouseAndViewportMarginsOlivier Goffart2011-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do not process the event, q->underMouse may return false in QGraphicsViewPrivate::centerView (as the QEvent::Enter has not been received yet.) It was working before if by luck, the window appears under the cursor. Change-Id: I9b4497683eae20915680297013a9c21fd6275f4b Reviewed-on: http://codereview.qt.nokia.com/2385 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| | * Fix compilation with namespaced buildsBradley T. Hughes2011-07-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QT_BEGIN_NAMESPACE and QT_END_NAMESPACE to src/corelib/tools/qfreelist.cpp Change-Id: Ie01e74a3c2d9cd4de1f52a546d13398e1409c86b Reviewed-on: http://codereview.qt.nokia.com/2390 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * Switch to use floating point pixelSize in QRawFont completelyJiang Jiang2011-07-297-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil (cherry picked from commit 500f8a4368be85a0ae8b7c46012deb0ab0c844ad) Change-Id: I6cfebcbb68697c9bf7a5634e98a09a26928467d7 Reviewed-on: http://codereview.qt.nokia.com/2386 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| | * Simplify the mutexpool used in QObject.Olivier Goffart2011-07-291-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now have QBasicMutex as a POD, we can simplify the mutexpool. This remove the call the the Q_GLOBAL_STATIC and some others tests that are taking CPU cycles when activating a signal. The QMutexPool class itself can't be simplified because its mutex are recursive mutexes, and the size is dynamic. also it is harder to get all the mutexes initialized to 0. Change-Id: Ie781655635907d2ad620eb189099cba14638414f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/2171 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * QMutex is now just a pointerOlivier Goffart2011-07-2914-459/+682
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And added a POD QBasicMutex. (QBasicMutex* can safely be static_cast'ed to QMutex*) The d pointer is not anymore always a QMutexPrivate. If d == 0x0: the mutex is unlocked If d == 0x1: the mutex is locked, uncontended On linux: if d == 0x3: the mutex is locked contended, waiting on a futex If d is a pointer, it is a recursive mutex. On non-linux platforms: When a thread tries to lock a mutex for which d == 0x1, it will try to assing it a QMutexPrivated (allocated from a freelist) in order to wait for it. Change-Id: Ie1431cd9402a576fdd9a693cfd747166eebf5622 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/2116 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Fix off-by-one error in binary searchJiang Jiang2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one-line change makes the binary search in QTextEngine::findItem behave consistently with the linear search that it replaced in commit acf678e57ed088f3e56a551cac6c7c3322005750. The new behavior seems to cause crashes in kword (and perhaps other applications) by triggering a logClusters assert, although I have been unable to create a unit test that reproduces this. Task-number: QTBUG-17209 Done-by: Dr. Robert Marmorstein <robert@narnia.homeunix.com> Change-Id: I68b79f024e9836e1cc8b0f3514889120541eb2ea Reviewed-on: http://codereview.qt.nokia.com/2343 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| | * Flag meta objects generated by QtDBusAaron Kennedy2011-07-292-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtDBus requires a QVariant argument to be passed to property reads and writes. For performance reasons QtDeclarative does not do this. By flagging the meta object as requiring this, QtDeclarative can do so only required. Task-number: QTBUG-15052 Change-Id: I032c946f079523f5f10217ed56642fb315265d9f Reviewed-on: http://codereview.qt.nokia.com/2365 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| | * Add notify signals for QIntvalidator, QDoubleValidator, QRegExpValidatorCharles Yin2011-07-295-17/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-19956 Change-Id: I5ab5e4494189ece5b0eb1f63e73e49cb2c4e9656 Reviewed-by:Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/2147 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| | * Make it possible to update a related table after an external updateAndy Shaw2011-07-292-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a table that is related to in a QSqlRelationalTableModel gets updated in some way (e.g. a new row, or the data is changed) then the related model could not be updated without recreating the QSqlRelationalTableModel. Now, to get around this, select() can be called on the related model to get it to be updated. Task-number: QTBUG-7885 Reviewed-by: Charles Yin Reviewed-by: Michael Goddard Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca (cherry picked from commit 2c60a4f67f9fb02f3b711fe749b2f293a07b4e02) Reviewed-on: http://codereview.qt.nokia.com/2224 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| | * Added meta type info for Q[Explicitly]SharedDataPointerDenis Dzyubenko2011-07-281-0/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: I1269630ae5154f7318e1c7ae9fa2014a15234bf4 Reviewed-on: http://codereview.qt.nokia.com/2110 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Get rid of compiler warnings with MSVCOlivier Goffart2011-07-283-21/+22
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd027c502a5b8bcbfc6dae71c4f244f1080d4064 Reviewed-on: http://codereview.qt.nokia.com/2303 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Emit selectionChanged signals when input method alters selection.Andrew den Exter2011-07-282-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark the selection as dirty if an input method event contains a selection and emit selectionChanged() if it's not emitted by finishChange(). Task-number: QTBUG-19731 Change-Id: Ief6f06f40071f64dae4db0ba365676c059a39c7e Reviewed-on: http://codereview.qt.nokia.com/2081 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| | * Fix typo in padnavigator example docsJason McDonald2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ifde02273107441add4eb77d8fc092eac2cc2c798 Reviewed-on: http://codereview.qt.nokia.com/2150 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | * Fix obsolete contact emailJason McDonald2011-07-286-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the old Trolltech contact email address with the current Qt contact email address. Task-number: QTBUG-20370 Change-Id: If5b9c3a044e1ee46264548eea456c704ced8e363 Reviewed-on: http://codereview.qt.nokia.com/2153 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | * configure: fixed setting of CFG_MAC_ARCHS for mac qpa buildsRohan McGovern2011-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the mac arch was only put into qconfig.pri for carbon and cocoa builds. Make sure it is also available for qpa builds. This is needed for projects which need to select architecture-specific sources in their .pro file. Change-Id: I5f72e3b699b11dafc4dae052620913f2b9b81d0a Reviewed-on: http://codereview.qt.nokia.com/2313 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Mark tst_qsslcertificate::verify with QEXPECT_FAILRohan McGovern2011-07-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test started to fail, complains about outdated SSL certificate. Task-number: QTBUG-20582 Change-Id: I2622375d9bc7b446dbbc18f72403896c60a8dee1 Reviewed-on: http://codereview.qt.nokia.com/2307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
| | * Revert "test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux"Michael Goddard2011-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 33cb4ff4d45ddf389a7c676b36ddaf45f20b2f37 Test still seems unstable :( Change-Id: I20d9c393e1553abba2a335532bee4e3ba716d8ce Reviewed-on: http://codereview.qt.nokia.com/2179 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| | * Try to make sure the config test script is installed.Michael Goddard2011-07-264-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| | * Tighten up the config test success checking.Michael Goddard2011-07-261-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try a lot harder to remove the old $TARGET output, since make clean isn't sufficient. Also fix a bug in program invocation that was hidden because of the stale files. Change-Id: I0a365409d81efb74c5836eaf9f129fd9b2cca77e Reviewed-on: http://codereview.qt.nokia.com/2052 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | * Use QFreeList for timer id allocationBradley T. Hughes2011-07-261-167/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer id allocator doesn't need a paylod (hence T=void), but we want to tune the allocation 'strategy.' We allocate a maximum of 6 blocks (like before), but the first block is twice as large as before and is not static writable anymore. The initial value is 1 (0 is not a valid timer id), but otherwise the constants are the same as the defaults. Change-Id: Ied49ff4d7a6a8d69bc8c7bfa5475e4111446659f Reviewed-on: http://codereview.qt.nokia.com/2161 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Add QFreeList as an internal classBradley T. Hughes2011-07-266-0/+544
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a generic implementation of the lock-free free list found in qabstracteventdispatcher.cpp. Use next() to get the next free entry in the list, and release(id) when done with the id. This version is templated and allows having a payload which can be accessed using the id returned by next(). The payload is allocated and deallocated automatically by the free list, but *NOT* when calling next()/release(). Initialization should be done by code needing it after next() returns. Likewise, cleanup should happen before calling release(). It is possible to have use 'void' as the payload type, in which case the free list only contains indexes to the next free entry. Autotest included. Change-Id: Ifd12a961d47f3d76593c45061f72e55c9b80a43b Reviewed-on: http://codereview.qt.nokia.com/2160 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Make QTabWidget::tabBar() public.David Faure2011-07-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is very much useful to be able to write things like myTabWidget->tabBar()->setSelectionBehaviorOnRemove( QTabBar::SelectPreviousTab ); without subclassing QTabWidget. Change-Id: Ic7c42709ea1086631d37f90f184b058c4b6e9601 Merge-request: 3 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/2172 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * Windows: fixed qtmain.lib not going to `lib' directoryRohan McGovern2011-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `load(qt_module_config)' clobbers DESTDIR. Rearrange the order so that our setting of DESTDIR works as intended. Change-Id: Id6f02e9fb55069fae9b2a75c9d0f51578b84f4d1 Reviewed-on: http://codereview.qt.nokia.com/2130 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| | * Improve doc to avoid row vs col major confusion.Sarah Smith2011-07-261-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There has been a few reports of user confusion from the fact that the constData and data functions return results in column-major format. There is nothing in the doc anywhere that states this, and nothing states that the class is especially for OpenGL which would give a clue at least. Change-Id: I3a9afde0fbeb8b9d2bcba6a387620b60a56774b9 Reviewed-on: http://codereview.qt.nokia.com/2066 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
| | * Emit selectionChanged signals when input method alters the selection.Andrew den Exter2011-07-262-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the input method removes the selection and force emit selectionChanged if it sets a new selection. Task-number: QTBUG-19727 Reviewed-by: Martin Jones Change-Id: Ic8ea1044d0917aac4e52368f431ac9e5c7db7c56 Reviewed-on: http://codereview.qt.nokia.com/2076 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| | * Update cursor position when selection is reversed.Andrew den Exter2011-07-262-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A reversed selection will have the same resolved start and end positions but a different cursor position so testing the end points alone doesn't guarantee the selection is the same. Task-number: QTBUG-19456 Reviewed-by: Martin Jones Change-Id: I516e5a501ec878d673f21e54d688fd2d21b624ef Reviewed-on: http://codereview.qt.nokia.com/2080 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| | * test: unmark tst_QWidget::getSetCheck() as "insignificant" for LinuxSergio Ahumada2011-07-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I86570148f1fcbf2932c6314b0a6c666c02a3554f Reviewed-on: http://codereview.qt.nokia.com/2127 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| | * Add the missing function in bootstrapOlivier Goffart2011-07-251-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | (required for the metatype changes) Change-Id: I0e3c73e7828493b4f03ec6439ec80b1c8c2bf377 Reviewed-on: http://codereview.qt.nokia.com/2105 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * testlib: fix include of `qttestversion.h' in testlib.proSergio Ahumada2011-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual file defined in `sync.profile' and generated by 'syncqt' is `qttestversion.h' instead of `qttestlibversion.h' Change-Id: I90ed2d5b7cd9f98855a878c97afceced01e7e8b0 Reviewed-on: http://codereview.qt.nokia.com/2050 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * Add initial support for bitmap version 4/5 headers.Ilya Konkov2011-07-255-9/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The headers are just skipped, information stored in them is ignored. Merge-request: 824 Change-Id: I48f37757114ed83cd5c92cb3d5a43eeaca4b91b3 Reviewed-on: http://codereview.qt.nokia.com/2108 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| | * Changed QLibrary::resolve() to return a function pointer.Kim Motoyoshi Kalland2011-07-2520-50/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the C++ standard, there is no guarantee that you can cast between function pointers and void pointers without data loss (section 5.2.10-6). Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd Reviewed-on: http://codereview.qt.nokia.com/1995 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * Making cached glyphs drawing check clearerJiang Jiang2011-07-254-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Putting the logic inside supportsTransformation() is a bit confusing and that name is misleading. Also move the same check in GL2 paint engine to the same place. Change-Id: I182500a0ff375122e6be966b7ce2495c84d113d0 Reviewed-on: http://codereview.qt.nokia.com/2096 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| | * Delay masking the last character in Password echo mode.Andrew den Exter2011-07-253-3/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an integer value in milliseconds, QLineEdit and TextInput will display the last character entered unmasked for that delay period and then mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is not defined then the behaviour is unchanged. Task-number: QTBUG-17003 Reviewed-by: Martin Jones (cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971) Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp Change-Id: I3683223189b7176e4ef5081ee315c95a0efb9cfe Reviewed-on: http://codereview.qt.nokia.com/2060 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| | * Use QUuid::toByteArray() instead of QUuid::toString().toAscii()liangqi2011-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cheaper way. Change-Id: Ibfc67e0ac46a77e95b2ef32cd6f28c7409c42d63 Reviewed-on: http://codereview.qt.nokia.com/2037 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
| | * Add rudimentary config.test support when configuring modules.Michael Goddard2011-07-223-1/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extra script is added (qtmodule-configtests) which is currently invoked from syncqt (with some derived parameters passed to it). The module can optionally have an entry in the module's sync.profile file in the form of a perl map of "test name" => parameters. Tests can print an advisory message if they fail (e.g. "Install this SDK/dev package"), or abort the syncqt process (e.g. mandatory prereq missing). Also, if the test has a "requires(foo)" line that results in it being skipped, this is also supported. Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6 Reviewed-on: http://codereview.qt.nokia.com/928 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * QAbstractConcatenable::convertFromAscii: make len the actual lengthOlivier Goffart2011-07-222-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, it was the length + 1, to include the ending \0 (for historical reasons) Having it the actual length is more intuitive and less error prone Also added QT_ASCII_CAST_WARN to QConcatenable<QByteArray>::appendTo to show the warnig that convertion from ascii to qstring occurs. Change-Id: Ie7c8552b6b4e7ccb393cb09f5f0ca9b00336c714 Reviewed-by: thiago Reviewed-on: http://codereview.qt.nokia.com/1988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>