summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stabilize Language-Change test.Friedemann Kleint2012-01-121-20/+62
| | | | | | | | | | | - Introduce separate state machine class with a timer instead of using semi-synchronous qWait(). Also invoke closeAllWindows() repeatedly should the file dialog be slow on Windows. - Use QTemporaryDir for test data to avoid conflicts with remains from previous tests. Change-Id: Ibd95176b44ff20d6f326dc3139fb386472f64c2b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix CONFIG+=declarative_debug if declarative is implicitly addedKai Koehne2012-01-121-1/+1
| | | | | | | | | | | | | Change 1fb5600c5eb2ee2af8a766dea5b325aee6dd43b4 already added declarative-debug as a way to include declarative, but nowadays there's also qquick, and qquick-private ... Just always set the define. The user has choosen to write CONFIG+=declarative_debug in the first place and an additional define if declarative isn't used does no harm. Change-Id: Ica6142e70b12950fc1d9e0bf7b94f747c843a17f Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* QTreeView: fix crash when starting a drag with hidden columns.David Faure2012-01-122-23/+38
| | | | | | | | | | | | Crash was introduced by d639105759491 (pre-Qt-4.8 only) Task-number: QTBUG-15834 Merge-request: MR-2725 (cherry picked from qt4 commit fd25323de7b5d5f3e0ffb1bd81ea4d251e071566) Change-Id: I59959d3ba4c9bcb0d39bdbe58432817bbbfdd9f1 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Set missing flags in the option when rendering QTreeView drag pixmapDavid Faure2012-01-126-40/+95
| | | | | | | | | | | | | | | | QAbstractItemViewPrivate::renderToPixmap was not setting all the flags that the normal QTreeView painting sets: option.showDecorationSelected, option.viewItemPosition (so the drag pixmap looked wrong on Windows 7, with rects around each cell), and then the unittest also discovered that State_Children/State_Sibling wasn't set either. Task-number: QTBUG-15834 Merge-request: 2517 (cherry picked from Qt4 commit d63910575949106f84dacf04abaa14fc866aa66b) Change-Id: I0a5014d960543c3ed8fea73d6df578e7e521b0e0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make expectfail selftest test XPASS.Jason McDonald2012-01-125-20/+46
| | | | | Change-Id: I0f7943049995c7fa4ad70a05fd2fdac4bc9f6ff6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make selftest for QEXPECT_FAIL more robust.Jason McDonald2012-01-121-1/+3
| | | | | | | | | | Make the test fail if calling QEXPECT_FAIL with the mode set to Abort does not cause the current test function to abort. Previously, such an error would not cause the selftest to fail and someone would have to see the warning message in the test output to know that there is a problem. Change-Id: I2bd58fafe6b51ea0ab86fde7c5afb781e4534ee4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve selftest coverage of QEXPECT_FAIL feature.Jason McDonald2012-01-125-15/+85
| | | | | | | | The existing expectfail selftest did not test QEXPECT_FAIL with a data-driven test function. This commit adds such a test. Change-Id: I39fa9aa227b58779ce5268dd37bf55468e7269c5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed findtestdata selftest on macRohan McGovern2012-01-121-2/+10
| | | | | | | | | | | | | This test relies on being able to set a custom QLibraryInfo::PrefixPath for the duration of the test. However, the test code neglected to account for the following behavior on mac (from "Using qt.conf" documentation): On Mac OS X, the Prefix is relative to the Contents in the application bundle. Change-Id: Ie9b6d5ebfe8af7d7f332e827069b60a830d6c6f2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Abstract QUnifiedTimer.Michael Brasser2012-01-122-130/+414
| | | | | | | | | | | | | QUnifiedTimer now controls QAbstractAnimationTimers, which in turn can be used to drive specific animation systems. The purpose of this change is to allow the QML animation system to be rewritten so that it does not depend on QAbstractAnimation. Change-Id: If06475002e41ba85b1b86b5dd4788de6d27d035d Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Flag test as expected failure for Ubuntu 11.10 x64.Toby Tomkins2012-01-122-0/+4
| | | | | Change-Id: I05ff434581f48d4d3ede7ecb59208821a2ab3e7d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* SSL Socket withoutproxy failures on Ubuntu 11.10 x64.Toby Tomkins2012-01-122-0/+24
| | | | | | | | | | | | Numerous failures in the qsslsocket autotest suite relating to connections without using proxies. Some have been skipped due to the number of failures, other more specific tests have been set to expect a failure. Task-number: QTBUG-23575 Change-Id: I35fccc65bcab303646617a57a33f5aa7f7a4323f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Flag tst_qgraphicsview as insignificant, test are unstable.Toby Tomkins2012-01-121-0/+2
| | | | | | | | | | | | Some of these test have had unstable results for multiple runs. QTBUG_4151_clipAndIgnore and QTBUG_16063_microFocusRect seem to be the unstable tests. Task-number: QTBUG-16063 Task-number: QTBUG-4151 Change-Id: Idd108197c327446080dbd69dfe5c5fba6b2944cd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Test that the CMAKE_AUTOMOC feature works with Qt5.Stephen Kelly2012-01-122-10/+12
| | | | | | | | Update the wrapper macro which had bitrotted a bit. Change-Id: I65c7940f9ebc0e1c963fddd2bbfc06b89e66df04 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Ensure proper locking in QFileInfoGathererBradley T. Hughes2012-01-121-2/+3
| | | | | | | | | | | | | | The mutex is used to protect the QFileSystemWatcher instance created by QFileInfoGatherer, except when calling getFileInfos(). Add a locker before using QFileSystemWatcher in this function. Note: it appears that QFileInfoGatherer is misusing QFileSystemWatcher by calling it from multiple threads. QFileSystemWatcher is an event driven class, and as such, not thread-safe. So far, no problems have been reported related to this, so I've left the code as-is. Change-Id: Ib1429d9399e37120acf8e8d3b989b83c4ce24203 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove unnecessary QMutexes in QFileSystemWatcher implementationsBradley T. Hughes2012-01-127-90/+69
| | | | | | | | | | | | | The polling, inotify, and kqueue implementations are no longer threaded, and as such, do not need mutexes to protect their internal data (since QFileSystemWatcher itself is not documented as a thread-safe API). The Windows implementation is unchanged as it uses multiple threads explicitly. Change-Id: Ia82510397e576bf704ce3aed3d776b58b39f7ff3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Avoid races when destroying QFileSystemWatcherBradley T. Hughes2012-01-122-0/+2
| | | | | | | | | | | | | | | On Mac OS X, socket notifiers need to be disabled/destroyed before closing their associated file descriptor, otherwise we cause races inside the CFSocket system. The documentation for CFSocketInvalidate() says that we close the file descriptor after calling this function when the kCFSocketCloseOnInvalidate flag is explicitly cleared (QCocoaEventDispatcher clears this flag). Do the same on the Linux inotify watcher as well, for symmetry. Change-Id: I5592cc4bb5be4b752e48d895a685d3c92826acc7 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Windows: Adapt cross mkspec for MinGW / gcc 4.6.Mark Brand2012-01-121-2/+2
| | | | | | | | | 4.6 becomes the minimum required version in Qt 5. This commit follows f6c61d13a3e166fc9280e8bfe8325cead335d0da. Change-Id: I151cd5ae63f076c4aa766bc5c9b9fb4d8fcd4f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed QOpenGLShader::log().Kim Motoyoshi Kalland2012-01-111-1/+0
| | | | | | | | log() returned an empty string because the compile log was stored in a local variable rather than the member variable. Change-Id: I60142fd0bccfcbb495cea430b583f81fb0241329 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Docs: Forward-ported typo and link fixes from Qt 4.8Janne Anttila2012-01-114-6/+6
| | | | | | | | | | | | | This commit brings already accepted doc fixes to Qt5. Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-21447 Change-Id: I2ebc7c3e74427545367bdcec51e9e710a4925747 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QStyleHelper: Base DPI-calculation on QScreen.Friedemann Kleint2012-01-114-40/+22
| | | | | | | | | | | | | | | - Use qt_defaultDpiX() to obtain the resolution, which obtains it from QScreen. This implies that for X11, which previously used a hardcoded default of 96 DPI, the real resolution will be used (typically 75). - Since many tests (layouts, graphicsview) contain test data for 96 DPI, add an attribute to QCoreApplication making it possible to set the resolution to 96 DPI for testing. Change-Id: I77c8233a96b0d75de07406f58d48886a89c3de06 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove unused QT_NO_TEXTSTREAM.David Faure2012-01-1111-38/+2
| | | | | | | | It was checked in a few places, but it didn't actually remove QTextStream, so it was pretty useless. Change-Id: I8eaf28893cd6c7acbe1c0b69d58de90742aee755 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* qlocalsocket_win.cpp: Fix compiler warning.Friedemann Kleint2012-01-111-1/+1
| | | | | | | Change-Id: Ibdb57f99b98b0c603be3c9be043737687034a958 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add QModelIndex as a built-in metatype.Stephen Kelly2012-01-115-1/+26
| | | | | Change-Id: Ib87cfff8b4baee78189f3df5e20d2e1a00d690e1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Don't enable V8's snapshot feature when building inside scratchbox for ARMTor Arne Vestbø2012-01-111-0/+5
| | | | | | | It will result in QEMU crashing. Change-Id: Ie2f607b6335ae0d08b9a6d67acc22ea666bcd780 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix Q_ASSERT_X to handle QT_FORCE_ASSERTSHarald Fernengel2012-01-111-3/+3
| | | | | | | This change aligns the behavior of Q_ASSERT and Q_ASSERT_X Change-Id: Iac9f399da6462fcf70826d3ce1177522bed9f897 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Input direction/locale to come from platform input contextPekka Vuorela2012-01-114-3/+63
| | | | | | Change-Id: Ib049693211a08dcffc9dbe49add54e7feab38978 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Make QAccessibleInterface::indexOfChild() 0-based.Frederik Gladhorn2012-01-1110-100/+80
| | | | | | | Makes the code nicer and more consistent with the rest of the world. Change-Id: I5ba0ee39f5b0afd1a079a3cea9990d123955ed3f Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Add support for accessibility actions.Morten Johan Sorvig2012-01-114-6/+95
| | | | | | | | Match Cocoa and Qt actions manually. Some have no corresponding action on the other side. Change-Id: I775cb8987ab843bd88d57d856ef7c0403290db00 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Add methods for font stretch and absolute letter spacingC. Boemann2012-01-113-4/+111
| | | | | | | We basicaly just rely on the methods in QFont Change-Id: Iaf8cbf4d90d0c5b10b3a85983de7ca58763e0371 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Remove universal build support from configure.Morten Sorvig2012-01-111-206/+16
| | | | | | | | | | | | | | | | | | Qt 5 will support single-arch builds only, for two reasons: 1) PPC is very deprecated at this point, x86_64 is becoming standard. 2) V8 only supports single arch builds. As a workaround, build twice and use lipo to create universal binaries. This commit also removes the -cocoa and -carbon options. Change-Id: I428f096a02f59ec2b3e693150e0e08358198de83 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove redundant parameter from qVariantToHelper.Jędrzej Nowacki2012-01-111-26/+27
| | | | | Change-Id: I3664a74eb8602651547c0c80dc4f628f909d97b4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Changed selftests unittest to not fail but warn when valgrind not installed.Kurt Korbatits2012-01-111-0/+15
| | | | | | | | | | - Changed to detect valgrind at runtime and skip test instead of failing. - subprograms inherit QT_QPA_PLATFORM value from parent if set. Change-Id: I280acee389df1ee74ee6758a0dd1601226e103c7 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed selftests unittest to work from installation directory.Kurt Korbatits2012-01-1138-177/+40
| | | | | | | | | | - All subprograms installed as part of test instead of separate installs - Added installTestHelperApp() to testcase.prf Change-Id: I02fbbb299f095054c9216ad0e5f91f574fb0fe3d Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make modules find their own dependencies.Stephen Kelly2012-01-112-3/+14
| | | | | | Change-Id: I4a7b96d33417a15d79f3932ced91bee58915c83f Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Match the name in the cpp fileAlbert Astals Cid2012-01-111-1/+1
| | | | | | | Which is actually the name Lars wanted i just forgot to fix it everywhere Change-Id: Iaa190da6c17d0a423c34202c986d69feec01af96 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Introduce a QVariant themeHint() to QPlatformTheme.Friedemann Kleint2012-01-117-34/+95
| | | | | | | Start on removing platform-specific code from QtWidgets. Change-Id: Ic2163a0ce6f2db2151cdf7ca93766b2d861eeb55 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Document enum value QAccessible::Expandable.Frederik Gladhorn2012-01-101-1/+2
| | | | | Change-Id: I5280bf3eadf7ef876f89de318a4d6168078d929e Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Accessibility docs: interfaces: value/action/text.Frederik Gladhorn2012-01-101-28/+236
| | | | | Change-Id: Ic57305cf9c008c8e861c1bdc66886b43d78c2d76 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Improve Accessibility documentation 2.Frederik Gladhorn2012-01-103-54/+77
| | | | | | | More cleanup, make sure links work. Change-Id: If72f9cfc0d44aa1fb261be2aace8ddd457295993 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* use "cp -R" instead of "cp -r" for *bsd compatibilityMark Brand2012-01-101-1/+1
| | | | | Change-Id: Ib013e2d36645a782249b543ec9301902484a7708 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Tests: Remove duplicate QTRY_VERIFY/QTRY_COMPARE macros in bearer.Friedemann Kleint2012-01-107-70/+87
| | | | | | | | | | Introduce QTRY_VERIFY_WITH_TIMEOUT and QTRY_COMPARE_WITH_TIMEOUT to be able to specify a timeout value. Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Change-Id: Iaeaa4938eb14f2c431537055f626510cba183ce3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* tst_qgraphicsivew: Run Motif scrollbar range tests only at 96DPI.Friedemann Kleint2012-01-101-27/+15
| | | | | | | | Preparing the introduction of a change that uses the actual QScreen resolution in the style helper. Change-Id: I3fbb36b0d6a34904c875a2e3684d73124f534bed Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix QWidget::saveGeometry().Friedemann Kleint2012-01-101-0/+3
| | | | | | | Bring back code that was accidentally removed. Change-Id: Ie1a4d22caa206bc8bb8e678879935e79009e9622 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove thread from QFileSystemWatcherEngine implementations.Robin Burchell2012-01-1010-184/+71
| | | | | | | | | | | | | | | | | | | | | | These threads are actually counterproductive, as generally speaking, processing watches is not that expensive an operation, so instead, they process at full speed and can (in the case of slow processing in the thread processing the events) stack up and consume resources for no good reason. Threads also have an additional resource consumption per engine (some ~8mb of thread stack on Linux), so doing away with them is nice. A side effect of this change is that events are now effectively rate-limited by the eventloop speed of the thread they run in, so if your thread runs too slow, and you recieve a lot of events, on some platforms, events may be dropped now where in the past, they would be read by the monitor thread and turned into Qt signals (thus not visibly showing as a problem, apart from invisibly bloating memory usage). Task-number: QTBUG-20028 Change-Id: I345a56a8c709f6f778ca9a0b55b57c05229ba477 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QMap => QHashOswald Buddenhagen2012-01-1013-121/+119
| | | | | | | | | | | | this should make the evaluator quite a lot faster. the total win for qtbase/src is only 6%, though. i made some effort to avoid that output files get randomized. however, i didn't bother to keep debug output sorted. Change-Id: Id9cef4674c0153c11ebbb65cb63bf8c229eb56e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't use check as an identifier in the configure app.Stephen Kelly2012-01-101-2/+2
| | | | | | | Avoids conflict with macro on Mac OS. Change-Id: I3426c2dc514240d80996d823b7a552c13a09f99e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename internal method check to doCheckStephen Kelly2012-01-102-18/+6
| | | | | | | | | | | Mac OSX has a check macro in /usr/include/AssertMacros.h which can conflict with this API if used together. http://boost.2283326.n4.nabble.com/Boost-with-Darwin-Mac-gcc-4-0-1-td2580330.html Change-Id: I93ddd08fa2b51b198bbc02ce501d79ed97a32c34 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add defines for explicit virtual overrides.Stephen Kelly2012-01-101-0/+17
| | | | | | Change-Id: Ia9a610e81eeaaa0a08ca6ef4945b002bdb13fe8a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make the supportedDragActions a virtual accessor.Stephen Kelly2012-01-103-11/+35
| | | | | | | Change-Id: I4001fcabc67e5b46465b3c9111c33247c52e5788 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* Fix a crash in QDialog.Friedemann Kleint2012-01-101-2/+2
| | | | | | | Call d->helperDone before deleting 'this'. Change-Id: I06224f4d3a868dccd505b1f1d3ed56af6f339ba3 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 19:23:43 +0000