summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-enabled tst_LargeFileJo Asplin2011-10-292-1/+3
| | | | | | | | | | | tst_LargeFile currently seems to pass in a stable way in CI It does have an issue on 64-bit Linux (see QTBUG-21175), so that test function is still disabled (QEXPECT_FAIL'ed) on that platform. Change-Id: I818046f84f2db5eb2155ae1f51f69581029bfaee Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove symbian threading primitive.Olivier Goffart2011-10-286-928/+3
| | | | | | | | | | | Those are already outdated and do not compile anymore (QMutex has changed too much) Better to remove that dead code so it do not show up in grep anymore Change-Id: I096e7a73e23cbb77050843c2e1c10929086fdb8f Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Correct dependencies for the platformsupport libraryLars Knoll2011-10-281-0/+1
| | | | | | | | | Without this make -jx would often fail as some of the dependencies of the platformsupport lib weren't built yet. Change-Id: I1e4fea5fa6f0dd5751b6b53458f1f14bfeb225b2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove stuff related to obsolete platformsLars Knoll2011-10-281-14/+0
| | | | | | | Qt/Embedded and Symbian are no longer supported. Change-Id: Ifb86a384c666f389a166efe798d4792115731adb Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove Windows and X11 from src/widgets/platforms.Robin Burchell2011-10-2882-52835/+10
| | | | | | | | | | This is dead code, unused with QPA in place, so remove it to avoid confusion caused through grepping for class names existing in both old and new places. Mac code is left in place for now, as some of it is still in use. Change-Id: Ia82cd5bbabe71285ca997f79d8fd9c0504e32c28 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Examples, plugins: Remove remains of qpa in profiles.Friedemann Kleint2011-10-284-19/+7
| | | | | Change-Id: I0fc45c6c4df6d1f07472aec30b9e64b55db8e543 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mark QAtomic* implicit cast and other operators as deprecatedBradley T. Hughes2011-10-281-0/+13
| | | | | | | | | | | | Add Q_DECL_DEPRECATED to all methods that are pending removal once http://codereview.qt-project.org/#change,6243 is merged. This is necessary to give people time to react to the source incompatible change. Change-Id: Ia72f184d630d593f96dd1d95ad6cd0d3bd5d811c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Get rid of legacy glTexParameterf calls.Samuel Rødal2011-10-289-75/+57
| | | | | | | | | | | ES 1.0 didn't have glTexParameteri, which is why we sometimes used glTexParameterf. However, we shouldn't use glTexParameterf because that's treating integer values as floating point, which is not type safe. ES 1.1+ and ES 2.x have glTexParameteri, and we don't really care about supporting ES 1.0 in any case in Qt 5. Change-Id: I6b586b31ddc418ba319c4cc88f6bb3978fdbd040 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Improve QTextBrowser unit test.Jason McDonald2011-10-281-0/+8
| | | | | | | | | The relativeLinks() test function was not performing sufficient verification steps and thus hid a regression. Task-number: QTBUG-22416 Change-Id: I2db4d4035e7a32f3c84630c7a15408d31d85ac9e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Move test data to the right place.Jason McDonald2011-10-281-0/+0
| | | | | | | | | | | This file seems to have been forgotten when the test it belongs to got moved -- probably because the test was poorly written and still passed when the file couldn't be opened. The file is supposed to live one directory up from the qtextbrowser test so that it can be used to test opening url's with relative paths. Change-Id: Id80965b1c73b37de75691ae3a18f909f9c6d799a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove redundant preprocessor directive.Jason McDonald2011-10-281-8/+0
| | | | | | | In Qt5, it's quite safe to assume that QT_VERSION is greater than 4.x. Change-Id: I2b7f491d79e084f3a52ee54c9e97419570b57584 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update changes file for tests and testlib.Jason McDonald2011-10-281-1/+28
| | | | | Change-Id: Ib8bc7b365166e75e54e693c550832849de6a0363 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update qmltest usage helpCharles Yin2011-10-281-2/+3
| | | | | | | | Add "-translation" command line option Task-number:QTBUG-22390 Change-Id: I0600b92767b73ccb54e8d70f6c7bb8bf8075c81c Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Freetype: Do not unlock face when returning superclass value in ↵Oliver Wolff2011-10-281-1/+0
| | | | | | | | | | lockedAlphaMapForGlyph If the face is unlocked in this case, calling unlockAlphaMapForGlyph after doing the operation will cause an assert. Change-Id: Icb2310a3b139e5bedf24f9c3794bd7d3fd38cfea Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Replace implicit QAtomic* casts with explicit load()/store()Bradley T. Hughes2011-10-2749-143/+140
| | | | | Change-Id: Ia7ef1a8e01001f203e409c710c977d6f4686342e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compiler warnings.Friedemann Kleint2011-10-2715-40/+25
| | | | | | | | - Fix gcc 4.6.X warnings about assigned but unused variables - Remove trailing ';' from inline functions (Clang) Change-Id: I8670afd6b149748a740f22c65de137762e9f18e1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Use load() instead of implicit cast when using QueuedConnectionBradley T. Hughes2011-10-271-12/+15
| | | | | | | | | | | queued_activate() sets the argumentTypes atomic pointer on first use, which mixes a load, memory initialization, test-and-set-ordered, and another load. The explicit memory ordering is necessary to ensure that the memory stores happen in program order. Change-Id: Id1f8641f9cd081ce81aa8e830692f7af8261e84b Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update QMutex benchmark to match the one in 4.8Bradley T. Hughes2011-10-272-1/+40
| | | | | | | Pull in recent changes in the 4.8 branch for the QMutex benchmark. Change-Id: Ie1e9bff33cecafb36d3d12207100f09f99597f8e Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Move the implementation of normalizeTypeInternal()Bradley T. Hughes2011-10-275-153/+212
| | | | | | | | | | | | | | | | | | | | | This function is only used in src/tools/moc/moc.cpp and src/corelib/kernel/qmetaobject.cpp. We don't need to include the static, non-inline declaration and definition every time qmetaobject_p.h is included. This also silences the related warning from clang: ../../../include/QtCore/5.0.0/QtCore/private/../../../../../src/corelib/kernel/qmetaobject_p.h:171:19: error: function 'normalizeTypeInternal' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] static QByteArray normalizeTypeInternal(const char *t, const char *e, ... ^ Change-Id: I6dfb2cb4d9d82a2ae7795f91169aa62f9a5f2c2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add QT_BEGIN_HEADER/QT_END_HEADER macrosSergio Ahumada2011-10-271-0/+4
| | | | | | | | | Fixing `macros' function test of `tst_headers' Task-number: QTQAINFRA-324 Change-Id: I9e78d5f33dcd89718d90e0d2a40a02eba80f6ca9 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Compilation fix (cannot assign const pointer to non-const pointer)Bradley T. Hughes2011-10-271-1/+1
| | | | | | | | After reinterpret_casting to const NSString *, we need to const_cast to drop the cast to match the return type. Change-Id: I3d202aec10e719a48f29d96b81621492936ac6ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed crash in printsupport on WindowsOliver Wolff2011-10-271-8/+1
| | | | | Change-Id: I3fec51b9f5c55296041b79bbf6da9d7687ae9afd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Make configure understand -W* argumentsBradley T. Hughes2011-10-271-0/+15
| | | | | | | | These will be passed on as extra C*FLAGS to the Qt build. Useful for adding -Werror or -Wno-something-or-other. Change-Id: Ifbbf63261573edd024de951082d99658eb443a3f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Compile with QT_ENABLE_DEPRECATED_BEFORE set to old version of QtOlivier Goffart2011-10-272-13/+12
| | | | | Change-Id: Ice67071cc97ad645a7dda264a3dce184fceae75a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add QDataStream operators to QMargins, so it can be streamedSteven Ceuppens2011-10-274-0/+82
| | | | | | | | | | * QDataStream format documented * Added Unit test for QDataStream operators * Updated Unit test Change-Id: Idbcfcb0b927e6369e8d31b57693c7aa0d1a154e7 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Do not call setCursor on Desktop or if there is no platform window.Friedemann Kleint2011-10-271-4/+10
| | | | | | | Fix a crash on Windows. Change-Id: I2b88e113d7149444ebc8946c0ee0eba7a9b5bbc2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove pointless QVERIFY(1) calls in QPainter testJason McDonald2011-10-271-4/+0
| | | | | Change-Id: Iae5fcb9fa7dc64ed2d2bd369dbe689c5136ad283 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use standard method of excluding a test.Jason McDonald2011-10-271-35/+9
| | | | | | | | | If we find out at run-time that an entire test program is not applicable, the correct way to skip the test is by calling QSKIP from the test's initTestCase() method. Change-Id: Iaf1dbcce38c569ee9513bf37232e9e4ea287d872 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Prefer compile-time checks to QSKIP.Jason McDonald2011-10-271-1/+25
| | | | | | | | | | Qt has compile-time defines for determining the presence of each style in the build. Use these to exclude inapplicable test data instead of including all test data and then being unable to distinguish the absence of a style from regressions in QStyleFactory. Change-Id: Iab1756aec80892a8b587bb635779537c64b1d4dd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unnecessary QSKIP.Jason McDonald2011-10-271-3/+2
| | | | | Change-Id: Icaa0687d5d0370ede6076cbee9d97d89e338ca17 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use load() when constructing QSimpleCodec's reverse mapBradley T. Hughes2011-10-271-7/+10
| | | | | | | | | | The implicit casting results in unnecessary volatile loads. The test-and-set-ordered doesn't need full ordering, test-and-set-release is enough to ensure that the memory initialization done by buildReverseMap() and test-and-set happen in program order. Change-Id: I168b504271aeba050d6b8396becbdeb3ef938213 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Windows: More fine-grained paint event handling.Friedemann Kleint2011-10-273-5/+15
| | | | | | | | Pass expose events to GL widgets, handle invalid update rectangles, ignore WM_ERASEBKND (using code from 4.8). Change-Id: Ide062efb392292fff556d37b0ef0e880676748a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed resource leak when setting QProgressBar style sheetTero Ahola2011-10-271-1/+2
| | | | | | | | | | | Task-number: QTBUG-19110 Merge-request: 2687 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit ecd78168271cfe71715e074a50752712f4aa3229) Change-Id: I49fdf0f74b903313089eb8cd778c80a19d34b461 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Initial support for MeeGo's input method serverSimon Hausmann2011-10-279-0/+1267
| | | | | | | | | | | | | | This platform input context plugin is based on the dbus protocol used in MeeGo 1.2 Harmattan's input method server. It supports composition, mouse-click-on-preedit as well as basic input method hints. Missing are: Copy & paste, preedit injection, key redirection as well as a bunch of other smaller MeeGoTouch specific features. Change-Id: Ic3a8741f7a5ed18b379985e316cb137f7b8f6a8e Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Kenneth Rohde Christiansen <kenneth.r.christiansen@nokia.com>
* Add default actions to QAccessibleWidget.Frederik Gladhorn2011-10-278-58/+119
| | | | | Change-Id: I9f251aad663fd0b8db2ef068c6581241d91c090d Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Native file dialog support for MacMorten Sorvig2011-10-2718-74/+1171
| | | | | | | | | | * New API: QPlatformDialogHelper to support native dialog on QPA. (Currently, It supports only file dialog.) * Modify QDialog* and QFileDialog* to support native dialog. * Add native file dialog support to cocoa platform plugin. Change-Id: I957f046748a27a33fd9f8af3c525feabd1b0f582 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Unix (non-Glib) event dispatcher: round sleep to millisecond boundary.Thiago Macieira2011-10-271-1/+15
| | | | | | | | | | | | If we have two timers running in an application with the same timeout and started almost at the same time by the code, they would trigger two sleeps, the second of which very short (under a millisecond). This causes us to match the Glib and Windows event loops, which round all timers to millisecond anyway. Change-Id: I7eb531e02dadf75925c01192b0f33ef3641ae1ea Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Tests: Remove Q_WS_QPA, qpa-sections from .profiles.Friedemann Kleint2011-10-2724-80/+59
| | | | | | | | | | | | Compile without -qpa. - Make Q_WS_QPA-#ifdefed sections the default in the code - Replace some Q_WS_ by Q_OS_ - Add ### fixme for places that need checking - Remove qpa conditionals from .pro files. Change-Id: I6ea930afc0c236cc12a7b7e95f1b8a1c24b3a513 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Cocoa: Set correct child window geometry.Morten Sorvig2011-10-274-31/+14
| | | | | | | | | Remote globalGeometry which was completely wrong, replace with flipRect which converts from Qt screen coordinates to OS X screen coordinates. Change-Id: Ie560cb7c2266fe779da8a44a35596d2d12af77f5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: Implement propagateSizeHints.Morten Sorvig2011-10-274-0/+28
| | | | | Change-Id: Idc1244ffbf975972f01d9ee48092500a72739d37 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove unreachable QSKIP in UIC autotest.Jason McDonald2011-10-271-8/+1
| | | | | | | | | If an autotest's initTestCase() method fails or skips, the remaining test functions are not executed. Thus the QSKIP in the run() test function was unreachable. Change-Id: If1f1b484958367236357f9445491bed50bee2239 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete MSVC workarounds from autotests.Jason McDonald2011-10-275-115/+0
| | | | | | | | Qt5 doesn't support MSVC versions before 2008, so workarounds for earlier versions are no longer required. Change-Id: I429feff99fe61d286637b960d92fd58962f8aefa Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Replace QSKIP with QFAIL in qputenv testJason McDonald2011-10-271-2/+1
| | | | | | | | If qputenv fails, the test should fail rather than skip, particularly as the test is supposed to be testing qputenv. Change-Id: Iabe13d360cabaeffda46fab19f1dd0d4ed8e1eee Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove inappropriate QSKIP in QTextCodec autotest.Jason McDonald2011-10-271-2/+1
| | | | | | | | | | | | There were only two ways the QSKIP could be called: (1) the C++ runtime is broken, or (2) the earlier call to resize the string failed. In both cases there should be a hard test failure. In the former case, a broken C++ runtime calls all of the test results into question. In the latter case, the QByteArray::resize() method has suffered a regression. Change-Id: I5adf942d2eb4d746d2ab31e98571c5d9bdd40890 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete QSKIP call.Jason McDonald2011-10-271-4/+0
| | | | | | | | The bug referenced in the QSKIP has been marked as resolved, so this QSKIP should no longer be needed. Change-Id: I41dd964827a3df8fb5ebb9674cef9db59c03d432 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix spellingMorten Sorvig2011-10-261-2/+2
| | | | | Change-Id: If9630ffa3a1c411b2e56b41ed35c272177343274 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* replace 'const QChar &' with 'QChar ' for QChar and QStringRitt Konstantin2011-10-266-52/+52
| | | | | | | | Merge-request: 69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I61f5a54b783252029fcad95677958fa6a2130d01 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Windows: Fix Open GL formats.Friedemann Kleint2011-10-264-91/+156
| | | | | | | | | | - Add swapInterval as additional format - Query context format correctly and store in separate struct (default vs requested/obtained) - Cosmetics, rename enumerations, structs. Change-Id: I381cf8e1bde33e6624feb549437c7b95dd85e93c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Revert "Use memmove in QListData::append(int) as regions overlap."Oswald Buddenhagen2011-10-261-1/+1
| | | | | | | | | | We have proven that the regions cannot overlap. The root problem must be somewhere else. This reverts commit d96b7b809e614dd416709acec768529457120b9f. Change-Id: I3446487f2a1a5bd322379b8adb788c26ff3e08e2 Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
* Implement child instead of navigate in QAccessibleMainWindow.Frederik Gladhorn2011-10-262-14/+11
| | | | | Change-Id: I321ce4f8bb6e724db87a0419f890174b32cc1fe2 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>