summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Windows: Use a message-only window as clipboard viewer or for GL.Friedemann Kleint2012-01-131-3/+3
| | | | | Change-Id: Ib8d287404b157aae2f4493ef8eba220afaba6c47 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Added application flags to translate between touch and mouse events.Samuel Rødal2012-01-1315-124/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current way we do it of having the platform or touch plugin send both mouse and touch events is not ideal. There's no good way to write an application that works sanely both on a touch-only device and on a desktop except by restricting yourself to only handling mouse events. If you try to handle touch events you don't get any events at all on desktop, and if you try to handle both, you end up getting duplicate events on touch devices. Instead, we should get rid of the code in the plugins that automatically sends mouse events translated from touch events. This change enables that by making the behaviour fully configurable in QtGui. Two new application attributes are added to explicitly say whether unhandled touch events should be sent as synthesized mouse events and vice versa, and no duplicates are automatically sent as the current situation. Synthesized mouse events are enabled by default. We also get rid of the QTouchEvent::TouchPoint::Primary flag, which was only used to signal that the windowing system automatically generated mouse events for that touch point. Now we only generate mouse events from the first touch point in the list. Change-Id: I8e20f3480407ca8c31b42de0a4d2b319e1346b65 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* QEventDispatcherWin32's internal Window should be a Message-Only WindowDebao Zhang2012-01-131-1/+6
| | | | | | | | | | | | A message-only window enables you to send and receive messages. It is not visible, has no z-order, cannot be enumerated, and does not receive broadcast messages. The window simply dispatches messages. Task-number: QTBUG-17144 Change-Id: Ibaf18f9ef5165166bf0b88e2f4952faba96d5eef Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Cocoa: Send window activation events.Morten Johan Sorvig2012-01-133-0/+22
| | | | | | Change-Id: I599b4316f1535bf4855b205bfb2117bbcee63bf0 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Remove the Q_NO_DATA_RELOCATION hackOlivier Goffart2012-01-135-67/+1
| | | | | | | | | | | | | | This hack was there because symbian used to have a problem with relocations in the data section, between libraries. Hence, this was needed so the metaobject could have a pointer to the base metaobject, despite being in another library. Anyway, I was told that symbian was fixed eventually. but the hack had to stay there because of compatibility. But now that we don't even support symbian, we can get rid of this hack totally. Change-Id: I7249971ece35d952efa92bf8b04bf3aa3667624c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improve coverage of expectfail selftestJason McDonald2012-01-135-26/+77
| | | | | | | | | Add a test case for calling QEXPECT_FAIL in a data-driven test without passing a specific data tag for the expected failure, in which the expected failure should apply to the current data row. Change-Id: I70a6592de77b1718c3a749fd2216e66f8f312805 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve coverage of expectfail selftestJason McDonald2012-01-135-26/+50
| | | | | | | | | Add a test for the case where a call to QEXPECT_FAIL nominates a different data row from the current row, in which case the call to QEXPECT_FAIL should be ignored. Change-Id: Iff774b89f9374fa26105acdd8769177272a95229 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qdoc3: Don't put a \table in a \valueMartin Smith2012-01-131-10/+19
| | | | | | | | | | | | | | | | | | | | In qdoc, the \value command is meant to document a single value of an enum. e.g. \value TypeOfService Text describing the type of service. It runs until the next \value or a blank line. Although it doesn't say you can't build a \table in the \value text, it doesn't work. For now, the fix is to remove the \table from the \value text and make the table separate from the enum \value list and let the description of the \table refer to the value that it belongs to. Task-number: QTBUG-23599 Change-Id: I88b456dca419a565eece30ba20fe09c0bcd4d98d Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc3: Don't put \relates in class member functions.Martin Smith2012-01-131-2/+0
| | | | | | | | | This removes two uses of \relates that were unnecessary. Task-number: QTBUG-23600 Change-Id: Id9bbcfa6f95d42ad552054e4839dbacb69fd1b2a Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Revert "Fixed qtmodule-configtests on Windows"Kalle Lehtonen2012-01-131-53/+35
| | | | | | | This reverts commit bb4caf3c4937418ca0e33d60cf0b25d6cfc3ea95 Change-Id: I25a9e45c9fa0953bdfe1bc112bf45341802c020d Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Improve coverage of expectfail selftest.Jason McDonald2012-01-135-23/+49
| | | | | | | | | Add a test for the case where QEXPECT_FAIL is called twice in a row without an intervening verification step, which is supposed to result in a failure. Change-Id: Ie004652a76a2c35c2679945670ff5561e8f5b62e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove shadowing members in QNetworkReplyHttpImplPrivateAlexander Færøy2012-01-121-2/+0
| | | | | | | Task-number: QTBUG-23512 Change-Id: I072dfde1741a1d32a6125f63e52cc22bc499987f Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Fix compilation of public headers with -Werror=shadowDavid Faure2012-01-122-3/+3
| | | | | Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed qtmodule-configtests on WindowsFriedemann Kleint2012-01-121-35/+53
| | | | | | | | | | | | open to "|-" and "-|" are unsupported on Windows (see `perldoc perlport'), so don't do that. Rather than parsing the output of make to decide if a config test is skipped, use a looser definition: it is skipped if qmake and make both succeed, but no binary is created. Change-Id: Idab7266888e9c934aa7b5c1c6ac5930439681107 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation of Qt itself with QT_NO_DEBUG_STREAMDavid Faure2012-01-127-15/+13
| | | | | | | Change-Id: I07087dff0f109347ea80434f17eeb7cc1c13114c Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove invokeMethod in favor of the recommended virtual_hook()Jan-Arve Saether2012-01-127-58/+11
| | | | | | | | | | We don't remove the Method enum (yet), since there are functions in dependent modules that still refer to it. Unfortunately there is no way we can commit to several repos "atomically". Change-Id: Ia1923dc4bf0751a9ba67727d14da5a2e60bd4e74 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove all references to QAccessible::(Up|Down|Left|Right)Jan-Arve Saether2012-01-128-560/+14
| | | | | | | | | | | | It is now the resonsibility of the bridge to support this (by querying for QAccessibleInterface::rect()) The windows bridge (currently the only bridge in need of this) has already been updated to reflect this in commit 7dca461620ee6d8cce3a74acf2e1530d4497bff9 Change-Id: Ief1339ab6edc118e2d47e3875e09fa885db65c2f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove QAccessibleEventFrederik Gladhorn2012-01-126-47/+0
| | | | | | | It was unused and I don't quite understand its purpose any more. Change-Id: I5c946a1644fd64508cb4aad78320ae96fd935d31 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Compile if the header files from QtWidgets are unavailableLars Knoll2012-01-124-5/+18
| | | | | Change-Id: I0a774fc1492e882bc6c02d913e6dace189fdb992 Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
* Make QFtp private.Jonas M. Gastal2012-01-1228-710/+106
| | | | | | | | | All references to QFtp in documentation have been removed, QFtp's documentaiton was marked internal. The QFtp example was removed. Task-number: QTBUG-23199 Change-Id: Ifff83cac069fb350e8ebeae63e605850e65c0c30 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add Q_COMPILER_* defines for C++11 features supported by clangBradley T. Hughes2012-01-121-1/+40
| | | | | Change-Id: I9487720c33e6ac628f7e13f80057524a950c4c5d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't crash during QApplication constructionBradley T. Hughes2012-01-121-1/+2
| | | | | | | | | | | | The QCoreApplication::init() function calls the virtual QCoreApplicationPrivate::createEventDispatcher(), which for QApplication, also creates the plaform integration. Unfortunately, the Cocoa menubar integration uses qApp before QApplication is constructed, causing a crash. Circumvent this by using QGuiApplicationPrivate directly. Change-Id: Ib36f628641761e70f9e9e39dd23e70e7537a165b Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Make QFileSystemWatcherEngines children of QFileSystemWatcherBradley T. Hughes2012-01-129-36/+33
| | | | | | | | | | To support moving QFileSystemWatcher to another thread, the engines need to follow when the watcher is moved. The easiest way to do this is by parenting the engines to the watcher. Change-Id: Ie2bb701c0c148da9cc2302d4de23286b8ef42c4d Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Do not call moveToThread(this) in QWindowsFileSystemWatcherEngineThreadBradley T. Hughes2012-01-121-1/+0
| | | | | | | | | This is considered bad practice, and gives no benefit as the threads do not use an eventloop. Change-Id: I0de9eca97948571cf5091e2f1b19bb1faab3e2ac Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add setPalette to QGuiApplicationLars Knoll2012-01-122-0/+11
| | | | | | | | If we have a getter, we also need the setter to be symmetric. Change-Id: Ibcb20d66c711e4c1bebd448781fa9eddb9cd773f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Don't include qdialog.hLars Knoll2012-01-121-1/+0
| | | | | Change-Id: I67d48653b90f31d018c77ec069eb559ac46f9275 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Made it possible to report screen changes through QWindowSystemInterface.Samuel Rødal2012-01-1213-57/+222
| | | | | | | | | | This makes it possible for platform plugin independent code (such as generic plugins) to report changes to screen properties. An example would be an accelerometer plugin that reports orientation changes without knowing anything about the windowing system. Change-Id: I984984b6d064327772c264bc942269422451da37 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QFileSystemWatcher/Windows: Output paths if FindNext fails.Friedemann Kleint2012-01-121-3/+15
| | | | | Change-Id: I72bd28868c84d37e3dd4ea8ab892fa092d853d4a Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Ignore uninteresting accessibile interfaces.Morten Johan Sorvig2012-01-124-2/+54
| | | | | | | | | Certain interface roles should be ignored and not be a part of the user-visible accessibility interface tree. Change-Id: I264fef909052c528ee505875e3a211a33114d881 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Do not mark any touch points as primary when no mouse event is sentLaszlo Agocs2012-01-121-4/+0
| | | | | | | | | The touchscreen plug-in generates touch events only and therefore no touch point must be marked as primary because that would mean there is also a mouse event created from that point which is not the case. Change-Id: I80c5fdbc52b048cd74c834900b6c8100963210e6 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make show() default to sane sizing behaviour based on the platform.Samuel Rødal2012-01-128-7/+40
| | | | | | | | | | | | | | | | Traditionally it's been hard to write a Qt app that behaves sanely across embedded and desktop platforms, i.e. defaults to fullscreen on embedded and non-fullscreen on desktop. For Qt 5 we can fix this by making the behaviour of the default QWindow::show() be customizable by the platform plugin. If the application developer wants to override this behaviour he can still use the explicit showFullScreen(), showNormal() etc functions. Change-Id: I26a907b404058e345d841c818daefbb57a26d3fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* 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>