summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix platformsupport as installable moduleJørgen Lind2011-08-112-2/+5
| | | | | | | Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d Reviewed-on: http://codereview.qt.nokia.com/2868 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andy Nichols
* Cocoa: Set child window geometry correctly.Morten Sorvig2011-08-112-15/+58
| | | | | | | | | | | Qt child window geometry is in the parent window coordinate space, convert from/to OS X screen coordinates when needed. Change-Id: I50d35dd35e51af8fc161ec363c0e996a0e8aa9f3 Reviewed-on: http://codereview.qt.nokia.com/2859 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Configure: Make QPA default when building on OS XMorten Sorvig2011-08-111-3/+1
| | | | | | | | | | | | Minimal patch to change the default. PLATFORM_MAC is now obsolete, and at some point we need to go through configure and remove it or replace usages with for example BULD_ON_MAC. Change-Id: Ic6a8609158b6021ead23d8731e683ef3a51cc4d7 Reviewed-on: http://codereview.qt.nokia.com/2780 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: Activate Qt apps on startup.Morten Sorvig2011-08-111-0/+6
| | | | | | | | | | | | | | This prevents Qt apps from launching behind the terminal and QProcess parent apps, which is the native OS X but not the cross-platform Qt behavior. This reverses the change made mid 4.x series and reverts back to the "old" Qt 4 behavior Change-Id: I99d9f95980db884f8614ec2df663305505e08531 Reviewed-on: http://codereview.qt.nokia.com/2858 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* include .cc and .CC in fix headers scriptGunnar Sletta2011-08-111-1/+1
| | | | | | | Change-Id: Ie8903d59013535e04537c1a5b50fa710a02cb8f0 Reviewed-on: http://codereview.qt.nokia.com/2849 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Implement "quit on last window closed" logic for QWindowGunnar Sletta2011-08-115-2/+88
| | | | | | | Change-Id: Ide33578ad60796f3e267b09be76cda87eaf873d0 Reviewed-on: http://codereview.qt.nokia.com/2827 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Don't try to use IBUS when dbus is not configured.Samuel Rødal2011-08-102-1/+5
| | | | | | | Change-Id: I315ef3d834e923b649e4306866666549852c254f Reviewed-on: http://codereview.qt.nokia.com/2825 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Removed unnecessary debug output in xcb plugin.Samuel Rødal2011-08-102-6/+0
| | | | | | | Change-Id: I3b354a8649971a5d8c68a0b4f6bbdf6475116d65 Reviewed-on: http://codereview.qt.nokia.com/2808 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Made QWindow::setVisible() send show and hide events.Samuel Rødal2011-08-103-14/+19
| | | | | | | Change-Id: Ideae15f7bd6801d7afe2354627c0893b0b6a32ca Reviewed-on: http://codereview.qt.nokia.com/2741 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* build without dbusMatthew Cattell2011-08-091-0/+2
| | | | | | | Change-Id: I5af35ff094bea08c83f0e65e72efa59adac2581c Reviewed-on: http://codereview.qt.nokia.com/2790 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Removed Q_XCB_NOOP's from QGLXContext.Samuel Rødal2011-08-091-13/+1
| | | | | | | | | | QGLXContext might be used from different threads than the gui thread, so don't trigger any XCB logging from there. Change-Id: I96a51ebf6987749d209b447c9ae2ac8b7298bd4c Reviewed-on: http://codereview.qt.nokia.com/2782 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Removed QPaintDevice dependency in blitFramebuffer().Samuel Rødal2011-08-093-2/+21
| | | | | | | Change-Id: I7294be5c4447d7e24dda95b822a9ce7b2abbccc4 Reviewed-on: http://codereview.qt.nokia.com/2783 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Get linux input plugin compiling by removing keyboard supportGunnar Sletta2011-08-094-227/+1
| | | | | | | Change-Id: I46ade27b5dde6c8d326a84e94abbbde1435889f8 Reviewed-on: http://codereview.qt.nokia.com/2765 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* make eglfs compileGunnar Sletta2011-08-083-3/+3
| | | | | | | Change-Id: I724b700ed87cbc5d69647032c0c9c8e7e1d82748 Reviewed-on: http://codereview.qt.nokia.com/2689 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Implement map/unmap and force geometry EglFSGunnar Sletta2011-08-082-1/+18
| | | | | | | Change-Id: Ia2d86e84acfeb30f41b06f106b93033fe54ed839 Reviewed-on: http://codereview.qt.nokia.com/2730 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Properly initialize window properties in xcb plugin.Samuel Rødal2011-08-051-2/+3
| | | | | | | | | Since 833090abb9a277 these need to be called manually. Change-Id: Iabc263d499e724d4d39c3d8350563feb57749879 Reviewed-on: http://codereview.qt.nokia.com/2704 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Get wayland plugin working after latest QPA API changes.Samuel Rødal2011-08-053-11/+8
| | | | | | | Change-Id: If54e7068aaed84fe765b887250bca79c787bd8a3 Reviewed-on: http://codereview.qt.nokia.com/2684 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Get rid of missing qmake warning.Samuel Rødal2011-08-051-2/+0
| | | | | | | Change-Id: I470e89cb5b2042cda1811ef327e0703c7510fd08 Reviewed-on: http://codereview.qt.nokia.com/2683 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added some convenience to QWindowGunnar Sletta2011-08-052-0/+26
| | | | | | | Change-Id: I367f5e3f586661322184cfa5f7653814569cb6e3 Reviewed-on: http://codereview.qt.nokia.com/2611 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add WindowStateChanged event.Friedemann Kleint2011-08-057-5/+52
| | | | | | | | | Not currently considering activation state. Change-Id: Iea9265d35536947b6cc85639bd9839e9fda69bdf Reviewed-on: http://codereview.qt.nokia.com/2609 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Undefine "slots" before including cocoa headers to make it compileGunnar Sletta2011-08-052-0/+2
| | | | | | | Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f Reviewed-on: http://codereview.qt.nokia.com/2328 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix wayland config testJørgen Lind2011-08-041-1/+1
| | | | | | | Change-Id: Ifb002fdcec8ce359e3393c9f9fa2809e136d782c Reviewed-on: http://codereview.qt.nokia.com/2600 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* compile fix for compiling without sslJørgen Lind2011-08-041-4/+8
| | | | | | | Change-Id: I48942dd437f9475c8584d5aef176f71464ae86be Reviewed-on: http://codereview.qt.nokia.com/2598 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge "Merge remote branch 'gerrit/master' into refactor" into refactorJørgen Lind2011-08-04133-1256/+2914
|\
| * Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-03133-1256/+2914
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
| | * Fix QString/QByteArray literals for MSVC2010 (compilation of tests).Friedemann Kleint2011-08-023-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Specify return type of QByteArrayLiteral/QStringLiteral lambdas. - Define QT_UNICODE_LITERAL instead of QT_UNICODE_MARKER. Change-Id: I8a53506887d2736b093798220b088f645f05e415 Reviewed-on: http://codereview.qt.nokia.com/2514 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * test: mark tst_qtconcurrentfilter as insignificant on LinuxRohan McGovern2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test fails pseudorandomly, which makes the result insignificant for the purpose of detecting regressions. Task-number: QTBUG-20688 Change-Id: I3274953841a553e35b4eb844702868f2f9ec0525 Reviewed-on: http://codereview.qt.nokia.com/2491 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| | * test: mark tst_qabstractnetworkcache as insignificantRohan McGovern2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test crashes pseudorandomly, which makes the result insignificant for the purpose of detecting regressions. Task-number: QTBUG-20686 Change-Id: I3079d935d46a4bcd2b119c2b9b452f0b69dccf21 Reviewed-on: http://codereview.qt.nokia.com/2479 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| | * Make failure messages from tst_QSslCertificate::verify much more usefulRohan McGovern2011-08-021-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the failure message from the previously brief: '(errors.count() == 0)' returned FALSE. To the vastly more useful: '(errors.count() == 0)' returned FALSE. (errors: [ "The certificate has expired" ]) Change-Id: I587cd8ddfd3c17e273220bc95691b3dc92390547 Reviewed-on: http://codereview.qt.nokia.com/2241 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 13:55:46 +0000