summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update the qunicodetables generator to deal with UCD 6.1 filesKonstantin Ritt2012-06-103-36/+102
| | | | | Change-Id: If22018ff83cfc6b9c984f689648da038fce11d84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Reorganise the painting.pri file after the last round of cleanupsThiago Macieira2012-06-101-29/+20
| | | | | Change-Id: I35f5356fc59d109074d39c4fafd608540743479a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Logging: Remove outdated QMessageHandlerKai Koehne2012-06-102-24/+0
| | | | | | | | Commit d9a1c2dff replaced QMessageHandler with QtMessageHandler. However, the old signature was still supported for a grace period. Change-Id: I3141499efdc749460b77de1ceec82f312e904bec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make qpointer autotest build without widgetsKent Hansen2012-06-102-1/+12
| | | | | | | Change-Id: Ibd05a49174e7055faa89c48659130a11418b9616 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Debao Zhang <dbzhang800@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* evdevmouse: send correct event position for wheel eventsJohannes Zellner2012-06-104-8/+17
| | | | | | | | The current position for mouse events is synchronized in the mousemanager, thus the wheel event needs to pick the event position from there. Change-Id: I1e73a0154b596885c7092f0a74e6dd448deb428c Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Add support for the x86intrin.h header on GCC systems.Thiago Macieira2012-06-091-0/+6
| | | | | | | | | | | | This header can be included at any time on x86 systems and is present since the GCC versiosn that also support AVX. It contains intrinsics for instructions that have been present in x86 CPUs since the dawn of time. Change-Id: I9adb066c2c0b56ce8fd5ed7366716038f1254502 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Use UTF-8 in the QtTest data and benchmark tagsThiago Macieira2012-06-0935-36/+36
| | | | | | | | | | | Future-proofing. Since Qt source code is now mandated to be in UTF-8, it is entirely possible that someone will use non-ASCII in data tags. Though it would be interesting to see how to access them from the Windows command-line. Change-Id: I880fc312432b62143888ff1e1d9abbd54f704601 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Replace deprecated QGraphicsScene::itemAt() with items()Thiago Macieira2012-06-091-1/+2
| | | | | Change-Id: I33ee03db775d3cf6807372e0963748cf6a4e07db Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Windows: Fix window positioning for ActiveQt serversMiikka Heikkinen2012-06-092-4/+19
| | | | | | | | | | | The toplevel window for an embedded ActiveQt server does not have a parent QWindow, but it does have a parent HWND, so is not a real toplevel. Enable using a QWindow property to inform windows platfrom plugin that a window is embedded and handle geometry accordingly. Task-number: QTBUG-25808 Change-Id: Ie26c53b587c312b1df397b25cb944019c020b8de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QWizard/Win: Drag window on Vista with only left mouse buttonJonathan Liu2012-06-091-1/+1
| | | | | | | | The QWizard window should only be draggable using the left mouse button on Vista. Change-Id: Ie6ec118cbb48440c5dc6b84c4361119b1bbbd0cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QWidget::destroy(): Release mouse and keyboard grab.Friedemann Kleint2012-06-091-0/+4
| | | | | | | | | This used to happen in the platform widget code. Task-number: QTBUG-26079 Change-Id: Id6de7473c2fa4381a39114d5122e06e3bde159fa Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix assert in painting demos when switching to OpenGL.Friedemann Kleint2012-06-091-3/+6
| | | | | | | | | | Fix creation order. The ArthurFrame receives a paint event with OpenGL set to true when the glw-member is still 0. Task-number: QTBUG-26084 Change-Id: Ib4b568d22ae925542e3a775403e4c983ea0b4de5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* implement Qt::TranslucentBackground for WindowsJoerg Bornemann2012-06-093-10/+35
| | | | | | | | | Adapted the Qt 4.8 implementation of translucent widgets in the Windows platform plugin. This is only working for non-OpenGL top level Windows. Change-Id: Ic4c1c52d33b380f530f6a07e96c0c154a0571415 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtPrintSupport - Add CUPS printer and options queries to pluginJohn Layt2012-06-094-10/+108
| | | | | | | | | | | | | | | | Implement initial support in the CUPS plugin for directly calling CUPS to obtain printer list and basic printer info rather than QCupsSupport. Add api to the plugin to return any options for a printer, usually IPP options as implemented for CUPS, but whatever applies for the host print system. Future changes will add support for returning the PPD options. This api may eventually be added to QPrinterInfo, but not in 5.0. Change-Id: I6c8bae4c9295009599e6ab31382f5fff4c93981f Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
* QZip: improve reading of zip files, fix some edge cases in writingKonstantin Ritt2012-06-082-17/+142
| | | | | | | | | | This supercede https://codereview.qt-project.org/#change,25111 and fixes some more cases; The autotest crash is fixed as well (but the test itself omitted due to .pro file misconfiguration) Change-Id: I4a3adde18b4f9a8ac9822f700eee71d2a12b9c2c Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Remove QFactoryInterface from style pluginsLars Knoll2012-06-083-23/+10
| | | | | | Change-Id: I5c41f1c8b91b5e1117b9163c137de4bf5f51099c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QtPrintSupport: Move printer list into plugin base classJohn Layt2012-06-084-15/+6
| | | | | | | | | Move the cached printer list from the Windows plugin into the base class so the CUPS plugin can also use it in a subsequent commit. Change-Id: Idf5fb7fc49b1820aad58f16e8854ab9120caa193 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Fix crash in qt_qpa_core_dispatcher() at application exit.Miikka Heikkinen2012-06-081-1/+6
| | | | | | | | | | | | | | | | | | In some situations it is possible to get events when QCoreApplication has already cleared the 'self' pointer and will thus not return an instance. For example, destroying screen at application exit when there are parentless dialogs open will result in hiding the dialog, which at least in Windows causes a call to QWindowSystemInterface::handleExposeEvent() which will need the core dispatcher down the line. Fixed the crash by checking if the QCoreApplication instance is valid instead of blindly using it. This should cause no problem as unhandled events are simply queued. Task-number: QTBUG-26061 Change-Id: Ide2350a62208433728e0271192c1da4b1efacc9b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove unused variable inSetParentGirish Ramakrishnan2012-06-082-5/+0
| | | | | Change-Id: Ie65514209f14d8f8b2396c1d6e37cd8c3e4c0c1a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use variadic macros where available to make QSKIP source compatible.Stephen Kelly2012-06-081-1/+11
| | | | | | | | | Otherwise this is a large source incompatbility during porting, so it makes sense to provide the option of using C++11 for that. Change-Id: I9792b3ae2c1fa3743bc9a2e74380134ea2f24add Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix crash in QTreeWidgetItem::sortChildren when adding new item.Markku Heikkila2012-06-082-0/+34
| | | | | | | | | | | | | | | | | | | This is a cherry-pick of 4f388c383e39b598d997e21bd9a4f16d89bd0625 from February Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and sorting is enbled in QTreeWidget. First call is from user code and second is caused by timer. When timer expires second call is made. This recursion is prevented with QTreeModel::SkipSorting skipSorting() in QTreeWidgetItem::sortChildren(); Task-number: QTBUG-20345 Change-Id: Ibf73e69274423f31397a9e391bfba7d5c4103a3c Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* eglfs: Disable eglfs when evdev is not presentGirish Ramakrishnan2012-06-081-1/+1
| | | | | | | | | | | | EGLFS has a hard dependency on evdev, so don't compile it when evdev is not present. This also removes the check that disabled EGLFS specifically for QNX. Since QNX doesn't have evdev, EGLFS will get disabled automatically. Change-Id: I9fdb364b2eff9b370fa238609a8f98af6ccb7f7b Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QDoc: Only print modulename::type on collision pages.Casper van Donderen2012-06-081-3/+2
| | | | | Change-Id: I090698b106456370f6c0982006243304f87dc70c Reviewed-by: Martin Smith <martin.smith@nokia.com>
* QtPrintSupport: Move plugin access of QPrinterInfo internals to baseJohn Layt2012-06-088-47/+31
| | | | | | | | | | Move all plugin methods requiring access to QPrinterInfo internals into the plugin base class, and remove the plugin classes as friends from QPrinterInfo. Change-Id: Ic527efc681e198abf19e038dd77c36bb8017d049 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Reduce QtWidgets dependencies in the Cocoa plugin.Morten Johan Sorvig2012-06-086-1415/+22
| | | | | | | | | | | | | | | | | | | | | b8246f08 added the new menus implementation which removes one of the major QtWidget dependencies. Continuing on the path to QtWidget-freedom this commit removes the following: - qmenu_mac.h/mm. Not used. - FORMS += filedialog.ui. Not used. - qt_strippedText from qaction.cpp. Duplicate. - Misc stray includes. What is left should be the dependencies needed by the print engine implementation. These will be handled at a later time. Change-Id: I0cead4cdaddcebd402d30c6112f3e889d0f28740 Conflicts: Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Make qfont autotest build without widgetsKent Hansen2012-06-082-4/+11
| | | | | Change-Id: I2ab344d44cb2aa8c59c1c28f7368784849d4b74d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make qicon autotest build without widgetsKent Hansen2012-06-082-1/+6
| | | | | Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add Qt::WindowTransparentForInput to Window flags manual test.Friedemann Kleint2012-06-082-0/+7
| | | | | | Change-Id: If27567a93d5a2e910289c680643503d02831d742 Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix a crash when calling effectiveWinId() on parentless widgets.Friedemann Kleint2012-06-082-23/+9
| | | | | | | | | | Remove the assert as it also triggers when the widget is one that currently has no parent (setParent(0)). Check that the WinId is != 0 in the cursor code. Change-Id: I711fc600f1d803c8f01c15df87984e742a4c23d2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove widgets lib dependency on platformsupport.Frederik Gladhorn2012-06-087-30/+32
| | | | | | | | Instead of the dependency add the one needed function as virtual to the QPlatformServices in QtGui. Change-Id: Ia4455f5ac88ec4d0480bd81635cebba62bbd8ac5 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Allow ISODate string without seconds in QTime::fromString().Mitch Curtis2012-06-082-0/+32
| | | | | | | | | According to ISO 8601 (section 4.2.2.3), seconds can be omitted from a string representing time. Task-number: QTBUG-2813 Change-Id: I2578f290845e46a8f49be489f1d7427984ae7f08 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Namespace the bundled zlib symbols, to avoid clash with user zlibaavit2012-06-085-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is being compiled and is using the bundled zlib, QtCore needs to export the zlib symbols, since zlib is needed in other Qt libraries as well. That gives a danger of a potentially disastrous symbol clash if the user later on links with both Qt and an external zlib (ref. e.g. QTBUG-15071). This commit enables a zlib compilation flag that causes all zlib symbols to be redefined with a prefix. Hence, they will not clash with a standard zlib. A minor drawback is that zlib.h will now have #defines for a few semi-normal identifiers. Hence, a couple of more changes are done: In the private qzip code, the identifer crc32 had to be renamed. QHttpNetworkReplyPrivate needed no change, but as a defensive measure the #include <zlib.h> is moved from the _p.h file to the .cpp file, to avoid surprising compilation errors later in code that include that header. This commit does not in itself solve the issue of how to let Qt libraries outside of qtbase use the same bundled zlib, but it is a prerequisite for that. Change-Id: If84105901a8c90d35009faffe660c85a6bd2fee5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove dependency from QFactoryInterface for the print pluginLars Knoll2012-06-083-22/+1
| | | | | Change-Id: Ia35890b72e7797ef655bf97b4a34af2908657c0e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QFactoryInterface from the input pluginsLars Knoll2012-06-084-23/+2
| | | | | Change-Id: Ia4a9dc5b4ef276dca39681848e531b4c9e4f64e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QFactoryInterface from bearer pluginsLars Knoll2012-06-088-52/+1
| | | | | Change-Id: I8d6736e56f34f49041fff409d040634475eb0bf5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove the QFactoryInterface dependency from platform pluginsLars Knoll2012-06-0815-104/+6
| | | | | Change-Id: I4010e59dcd8a790e06bb9a0ccf3cc9a5c7737ed1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QFactoryInterface from the generic pluginsLars Knoll2012-06-088-55/+8
| | | | | Change-Id: I5a4351ca4b6605f9628496701bb8c6063cf36c78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QFactoryInterface from picture pluginsLars Knoll2012-06-083-23/+10
| | | | | Change-Id: I7b02cbfb850d6a9fc90c1eb1e12a9950baf61e77 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QFactoryInterface dependency from icon pluginsLars Knoll2012-06-083-21/+16
| | | | | Change-Id: I65bed1646f3c5e89329a6bbe3dcdbdb5660b7004 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove the QFactoryInterface dependency from accessible pluginsLars Knoll2012-06-087-135/+11
| | | | | | | QFactoryInterface is not needed anymore and will get removed soon. Change-Id: Ib2806200b1a7f4a45d62e2b556380946ef68f585 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Don't inherit from QFactoryInterface for image pluginsLars Knoll2012-06-088-54/+13
| | | | | | | | | | QFactoryInterface is obsolete now that we have the new plugins loading mechanism, where we can get the keys out of the plugin without having to load it. Remove it from QImageIOHandlerFactoryInterface as a first step of getting completely rid of it. Change-Id: I856b149dd20131e1cdcdcb271c1a355c9e0da6ab Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix eglfs regression in configureDonald Carr2012-06-071-0/+1
| | | | | | | | | XPLATFORM_QNX was never explicitly set, yet the tests which evaluate it assume that it is. Change-Id: If97d2ee1f4432ada0c68e36348bf5bec85f94e43 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* SIC: QPrintSupport - Remove options api from QPageSetupDialogJohn Layt2012-06-075-137/+8
| | | | | | | | | | | | | QPageSetupDialog has an enum PageSetupDialogOption, however one option had support removed in Qt 4.5 and the remaining 2 are actually for an internal implementation detail that could lead to memory leaks if changed by an app. This change removes the enum and the api as they is now useless. Change-Id: I9a3ab689dcab57151de894db5ebf22f6ad90d71e Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Shift positions for lineBreakTypeKonstantin Ritt2012-06-076-16/+17
| | | | | | | | | | | | | | | | | | | to keep them consistent with positions for all other flags. This changes the internal behavior so that attributes[0].lineBreakType now means "break opportunity at start of the text (before the first character in the string)" and is always assigned with HB_NoBreak to conform rule LB2 (see http://www.unicode.org/reports/tr14/#LB2). The current implementation is based on the sample implementation from tr14 that aimed to be as simple as possible rather than to be optimal. From now, we can use pieces of the attributes array "as is" without having to adjust some positions. Or we can analize some long text by chunks (e.g. paragraph by paragraph) and consume less memory. This introduces a minor overhead that will be eliminated shortly. Change-Id: Ic873a05a9d5203b1c3d5aff2e4445a3f034c4bd2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QTextBoundaryFinder: Consider soft hyphen as line breaking opportunityKonstantin Ritt2012-06-073-6/+42
| | | | | | | SoftHyphen enum value was added to specify such a boundary reason Change-Id: I4248909eed6ab8cbca419de4dcf9fe917620a158 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Set the whiteSpace flag outside the grapheme and the line breaking loopKonstantin Ritt2012-06-071-7/+21
| | | | | | | | | | | | | | | The white spaces determination doesn't belong to the text breaking algorithm. A proper breaking implementation shouldn't assume spaces are break opportunities (actually, space is allowed to be a grapheme base); However, the whiteSpace flag should never be checked alone while iterating over the text to find the space sequence; the grapheme boundaries should always be taken into account. This covers the SMP code points in UTF-16 text and graphemes that consist of a space followed with one or more grapheme extenders. This introduces a minor overhead that would be eliminated some later. Change-Id: Ic2cc7f485631fd0b436fc256ce112ded5f94fc07 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove QFactoryInterface from sql driversLars Knoll2012-06-0712-91/+10
| | | | | | | Change-Id: Ib31e6c4ce5264fc1e4281c8846df5630a6479a7c Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Deprecate the use of QWeakPointer to track QObjects.Stephen Kelly2012-06-073-52/+28
| | | | | | | | | | | | | | The main problem with using QWeakPointer to track QObjects is that it has API to convert to QSharedPointer, which is undefined behavior. There is no need to overload the meaning of QWeakPointer with QObject tracking. QPointer is more suitable and should be used instead. Because QPointer is implemented in terms of QWeakPointer, we need to add some overloads which are not deprecated. Change-Id: If0333e4800c9fd277629cc69185c9ca3e4e7e81d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Expand the 'existing target guard' in generated CMake files.Stephen Kelly2012-06-072-23/+21
| | | | | | | | | | | | | | | | | | | | This way the target will be created and have its properties populated only one time. I tried wrapping the whole file in an 'include guard', but that broke the unit test in tests/auto/cmake/pass1 (and the qt5_use_module function), because the function causes the variables in the Config file to not exist outside of the scope (eg for include directories), and yet, Qt5${Module}_FOUND is still true even when the find_package was previously called in a function, so it is not found and processed again. The change in Qt5CoreConfigExtras.cmake does not need to be guarded as it is only ever included from Qt5CoreConfig. Change-Id: Iaa016563db5eb61294360ac9e003c9c923393d8c Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Added SpellCheckUnderlineStyle theme hint.Samuel Rødal2012-06-073-2/+13
| | | | | | Task-number: QTBUG-25115 Change-Id: I70abbed426ad8bebca51823ed5ce16f2f300b5cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>