summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix MIPS DSP configurationAllan Sandfeld Jensen2017-01-275-66/+82
| | | | | | | | | The patch fixes a number of bugs in code, and removes dead logic clarifying that MIPS DSP, like ARM NEON, has no runtime detecton. Change-Id: If2f4eea68da5b2eaa80b8e9c8258206d8c1b7173 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QKeySequenceEdit: Allow for the case where pressing SHIFT+letter gives a ↵Andy Shaw2017-01-271-9/+23
| | | | | | | | | | | | | | different letter On some keyboard layouts it is possible that pressing SHIFT+letter does not give the upper case version of the character. So we depend on QKeyMapper here to give us the right keysequence as then it will compare against a shortcut created with this combination then. Task-number: QTBUG-57928 Task-number: QTBUG-57931 Change-Id: I9421f3ab4d3f8d1ee42f9680200d4b017d551057 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix build without features.movieTasuku Suzuki2017-01-271-2/+2
| | | | | Change-Id: I244a618f8660262249455ee707b62e6355583a74 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* qnetworkproxy_mac - fix proxyAutoConfigCallbackTimur Pocheptsov2017-01-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | We have an invalid pointer dereference in our callback. Apple's docs are quite ambiguous, whatever we receive in our callback's 'client' parameter is our PACInfo, not clientContext's address. That's what we pass to CFNetworkExecuteProxyAutoConfigurationURL: "clientContext - A stream context containing a client info object and optionally retain and release callbacks for that object." This 'client info' is our PACInfo struct with 2 pointers. Now in a callback, 'client': "The client reference originally passed in the clientContext parameter of the ..." So apparently we should read this as "client info originally passed in ...." Otherwise incorrect cast results in invalid pointer (apparently the value of retain/release/copy pointers we carefully set to 0) and a crash on dereference. Task-number: QTBUG-56747 Change-Id: I89378f1582679638cd29a36c563e506d8f5af518 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Fix dock widget having the wrong parent after a dragSergio Martins2017-01-261-2/+4
| | | | | | | | | | | | | | | | When dragging a dock widget from a floating group to the main window reparentWidgets() is supposed to be called. It's usually triggered by some unrelated event, like a LayoutRequest. Instead of relying on luck for reparentWidgets() to get called be explicit, otherwise the dock widget that was dropped into main window will still have as parent the floating group window. The item.skip() condition seems overly restrictive. Task-number: QTBUG-58036 Change-Id: I65b5699e1acb6ca9bedb10620daa055fa9d91943 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Make custom colors in QColorDialog permanentKai Koehne2017-01-261-1/+1
| | | | | | | | | [ChangeLog][QtWidgets][QColorDialog] Fixed long standing bug that prevented custom colors in QColorDialog to be stored in the settings. Task-number: QTBUG-58424 Change-Id: If3ee5eef75358d811f08e7ce52fb60622972ddd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove duplicated feature definitionPaul Olav Tvete2017-01-261-7/+1
| | | | | | | The "spinbox" feature was defined twice, and in two different ways. Change-Id: Iabc8939036e2166c5c5a417181ae8fb244829123 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix build with -no-feature-lineeditPaul Olav Tvete2017-01-261-0/+4
| | | | | Change-Id: I171aed5d134db88f211da0e1a6ce236e32f3c35c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix printsupport dependenciesPaul Olav Tvete2017-01-261-2/+2
| | | | | | | This makes -no-feature-printer and -no-feature-combobox work. Change-Id: I1097ab0a81f1c92b808c3e36ced0db9117db559a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Accept all formatting characters as valid inputEskil Abrahamsen Blomfeldt2017-01-261-3/+3
| | | | | | | | | | | | Amends 7896ae052ad2c0c6ae2ebfc64cc2f525185198a8. The previous change focused only on ZWJ and ZWNJ, but there are many other formatting characters that we need to support and that may be rejected by the German keyboard-hack. This opens up for all characters in the Other_Format category. Task-number: QTBUG-58364 Change-Id: Idd967a9ae5b12060c851f6030b7e019508561696 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* XCB QPA: Fix QScreen::grabWindow(0) to return the current screenFriedemann Kleint2017-01-261-58/+59
| | | | | | | | | | | Previously, the code queried the window to be grabbed for the geometry and thus returned the entire virtual desktop for multi screen setups. Use the QPlatformScreen's geometry in case of WID = 0. Task-number: QTBUG-58110 Change-Id: I3a9c0b0b3ea057f5e58f272f5c3fd40fafc073ba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QGuiApplication: fix misleading codeMarc Mutz2017-01-261-5/+4
| | | | | | | | | | | | | | | | | | The comment says "don't send event if nothing changed", but the condition it is attached to reads if (velocityOnly), which is totally opaque. Change the variable name to stationaryTouchPointChangedVelocity and drop the then-branch of the if, because it is duplicated in the following default case of the switch. The comment makes sense again, and GCC 7 is happy, too, because this whole issue was pointed out by its -Wimplicit-fallthrough, which is why I added the fall-through attribute, too. Change-Id: I0631a381095f8897c55d9440304f6aefbc021a9a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
* QEventDispatcherWin32: remove tailings of Windows CE codeAlex Trotsenko2017-01-262-24/+0
| | | | | | | | It was automatically merged from 5.6 branch. Qt 5.8 does not support Windows CE. Change-Id: I6968f50ef568035c224851d595d6c057128491a7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Doc: add a note that UniqueConnection does not work for lambdasThiago Macieira2017-01-261-1/+7
| | | | | | | Task-number: QTBUG-52438 Change-Id: I3e4e5051937c40319d6efffd1491bef6feb6776e Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix warning about not calling the base class copy constructorThiago Macieira2017-01-261-0/+3
| | | | | | | error: base class ‘class QBasicAtomicPointer<void>’ should be explicitly initialized in the copy constructor [-Werror=extra] Change-Id: I2bc52f3c7a574209b213fffd149b4b71f3006be5 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-253-7/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/platforms/android/qandroidinputcontext.cpp Change-Id: I80f35a3d722f1e218ff338b6652e551da45c38e7
| * Windows QPA: Do not return QPlatformIntegration::ShowIsMaximized in tablet modev5.8.0Friedemann Kleint2017-01-181-5/+0
| | | | | | | | | | | | | | | | | | | | | | The hint is not appropriate for Windows 10 tablet mode as it affects only main windows. Dialogs should still show up in normal size. Partially reverts change d377f14fd5b4fe3ed64392c6b743bac395f9f891. Task-number: QTBUG-58227 Change-Id: If9cf4990eb40913904cd97e17a7622bc6cbe84ca Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Fix registration of system default fontAllan Sandfeld Jensen2017-01-182-2/+2
| | | | | | | | | | | | | | | | | | | | QPlatformFontDatabase::resolveFontFamilyAlias returns the input unchanged if the font-name is not found. This means we never register the system default font when it is only a virtual font name. Task-number: QTBUG-58225 Change-Id: Ib4f80bb758aa66a163d223573bfe624bb3c134ab Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Android: transform input rectangle correctlyPaul Olav Tvete2017-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | QRect::setX/setY will change both position and size. In this case, the width and/or height of the input rectangle could end up negative. The correct functions to use are moveLeft/moveTop which will preserve the size when changing the position. Task-number: QTBUG-58179 Change-Id: I71a2e38958754dc53e062ad1c780e2337f72ec32 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | QVariant of nullptr should always be nullAllan Sandfeld Jensen2017-01-251-1/+21
| | | | | | | | | | | | | | | | | | Implements isNull for QVariants of a nullptr so they always return true to isNull(), instead of depending on how they were constructed. Task-number: QTBUG-58296 Change-Id: Ibddec795cdadedef7e17d22c265c29e752d8f99f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Improve QTest::qWait() precision and switch to QDeadlineTimerAllan Sandfeld Jensen2017-01-251-18/+18
| | | | | | | | | | | | | | | | | | Do not wait up to the timeout ms after already having waited several times. At the same time upgrade to using the QDeadlineTimer which is designed for this purpose. Change-Id: Iaf5e4f4655605d5143ce91040c6eb6706752e504 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Rename "interface" to "iface:" there's a #define in windows.hThiago Macieira2017-01-251-3/+3
| | | | | | | | | | Change-Id: Ibe5b1b60c6ea47e19612fffd149cd2d07116584b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Fix build with -no-feature-whatsthisPaul Olav Tvete2017-01-251-0/+2
| | | | | | | | | | Change-Id: I2f31357e91b01f826ef44710f477b80fde1f3fbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-treewidgetPaul Olav Tvete2017-01-251-2/+2
| | | | | | | | | | | | | | Make sure the feature is defined before testing it. Change-Id: I4d4b555c9f2629c8a3ca58cf52efff279f6a78f5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Compile with -no-feature-tooltipPaul Olav Tvete2017-01-253-0/+6
| | | | | | | | | | Change-Id: I6093559dd7b8df578ebd050655fb9bd07e5f6809 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-toolbuttonPaul Olav Tvete2017-01-253-2/+12
| | | | | | | | | | Change-Id: I16495548fa3ed24409883fadab08ddb8545efd0d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-tabbarPaul Olav Tvete2017-01-254-5/+26
| | | | | | | | | | Change-Id: I97c5345f2627743876aa05a94ffc03f2a6012b6c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-tabwidgetPaul Olav Tvete2017-01-251-11/+9
| | | | | | | | | | Change-Id: I0fbabdfec763f1647bf85582afe088a3e5b42e1f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-sliderPaul Olav Tvete2017-01-252-1/+3
| | | | | | | | | | Change-Id: I36e5c850068c2f9ac2ae078a3734ddb88d88c532 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-texteditPaul Olav Tvete2017-01-252-1/+5
| | | | | | | | | | Change-Id: I4a75c134803043180c57287ca352e26e3422204c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix styles compilation with features removed, round 2Paul Olav Tvete2017-01-254-11/+72
| | | | | | | | | | Change-Id: I8f09a8844e5edc1ad3e3dfd39eca9f3b42c5c828 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-rubberbandPaul Olav Tvete2017-01-251-1/+2
| | | | | | | | | | Change-Id: Ida6698c4868507ccbf5b4c5e3eb1d2f5a7109f53 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-menubarPaul Olav Tvete2017-01-251-2/+9
| | | | | | | | | | Change-Id: I23b23fcaf6fcc655d38a06495127b108975f4a58 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-menuPaul Olav Tvete2017-01-253-2/+10
| | | | | | | | | | Change-Id: I8f9d5ef6b7f7102e56816677f1d3a5b5144b7083 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Compile with -no-feature-itemviewsPaul Olav Tvete2017-01-253-5/+11
| | | | | | | | | | Change-Id: I23506f06df35f124f5eb9fcc8426c63b407a0872 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-graphicsviewPaul Olav Tvete2017-01-251-0/+3
| | | | | | | | | | Change-Id: I9ae724ddf90efc9e951d475e3332083e6f8207d6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -no-feature-dockwidgetPaul Olav Tvete2017-01-251-4/+20
| | | | | | | | | | Change-Id: Id484b54fd7191715e61ba6708247357b83159f28 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix style compilation with -no-feature-...Paul Olav Tvete2017-01-255-6/+41
| | | | | | | | | | Change-Id: Ic7fadf0622f98d339322a4a1d4d5c36908f4f7f6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Remove reimplementations of removed featuresPaul Olav Tvete2017-01-252-4/+4
| | | | | | | | | | | | | | Avoid the "marked ‘override’, but does not override" compile error. Change-Id: I4b125f1951614045781f3059fbc5cb65dd26775c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Make sure features are defined before testing themPaul Olav Tvete2017-01-253-9/+9
| | | | | | | | | | | | | | | | | | Include the file defining the feature before testing whether the feature exists. Also use the new feature macro to make sure this bug doesn't happen again. Change-Id: I204836fee59b143a7ce7d256a7aed223c4d0ceb1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix printsupport compilation with -no-feature...Paul Olav Tvete2017-01-254-4/+18
| | | | | | | | | | Change-Id: I881e736aefd4068965edb2a57f4436ee43d2bb93 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build without features.temporaryfileTasuku Suzuki2017-01-254-3/+14
| | | | | | | | | | | | Change-Id: I3f26f122a20aa8e59baaf3f33b89cc776865ff8b Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Remove use of deprecated QRegExp from QLibraryInfoSamuel Gaist2017-01-241-8/+18
| | | | | | | | | | | | | | This patch replaces QRegExp by QString search and replace. Change-Id: I11165afa45f8f9a856e6fb9b64929e4bdacb913d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Use context as glyph cache key in GL paint engineLaszlo Agocs2017-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from ctx->shareGroup() to ctx. The original intention to use the same cache instance for sharing GL contexts is reasonable, but can only work when there are only shareable resources involved. The FBO used by QOpenGLTextureGlyphCache is not one of these. Text rendering in Qt Quick already uses the same approach and uses per-context glyph caches. Change-Id: Ie7e521769f28b4902ca714eb029acfbf52814309 Task-number: QTBUG-58276 Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Fix possible loss of data warningJesus Fernandez2017-01-241-1/+1
| | | | | | | | | | | | | | | | warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data while compiling class template member function 'QVarLengthArray<T,Prealloc>::QVarLengthArray(std::initializer_list<T>)' Change-Id: I36f5ef65ec1f511eac7f3ad1a4717d18f7dc9ce4 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Fix mouse extra button mapping on macOSAlexandru Croitor2017-01-241-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously extra mouse buttons apart from left, right and middle buttons, were mapped incorrectly with an offset of -1. This resulted in the first extra button being recognized as the middle button, the second extra button as the first extra button, etc. Fix consists in using a binary shift with proper offset to create the corresponding Qt::MouseButton value. [ChangeLog][macOS] Fixed extra mouse buttons to be mapped to correct Qt::MouseButton values. Change-Id: I9e6084586cd4737a172b7706a805211f0edff749 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | model-view-programming.qdoc: Add missing list/endlistFriedemann Kleint2017-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes qdoc-warnings: qtbase/src/widgets/doc/src/model-view-programming.qdoc:2076: warning: Command '\li' outside of '\list' and '\table' qtbase/src/widgets/doc/src/model-view-programming.qdoc:2077: warning: Command '\li' outside of '\list' and '\table' qtbase/src/widgets/doc/src/model-view-programming.qdoc:2078: warning: Command '\li' outside of '\list' and '\table' qtbase/src/widgets/doc/src/model-view-programming.qdoc:2079: warning: Command '\li' outside of '\list' and '\table' Amends change 7adfe7494bb4a2c1d3a036fe9dfd946bc00c5d49. Change-Id: Ifa1121ba743c17d7223058e780ad03211565e3ff Reviewed-by: David Faure <david.faure@kdab.com>
* | Fix MIPS32 processor detectionAllan Sandfeld Jensen2017-01-243-16/+9
| | | | | | | | | | | | | | | | | | | | | | Gcc defines neither _MIPS_ARCH_MIPS32 nor __mips32 on MIPS32 architectures, instead __mips is defined to 32. This fix exposed bit-rot in qdrawhelper where qt_memfill32 was set as a function pointer despite not being one since Qt4. Change-Id: I87461823e54fa3166223ebf97175fd05d2f2fd16 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Cocoa: fix crash regression in qt_mac_create_nsimage()Oleg Yadrov2017-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | The regression was introduced in d8857f21ac264. The original change was meant to fix support for SVG icons, but failed to take into account a valid QIcon with no sizes, but which is also unable to create a pixmap for the requested size. Task-number: QTBUG-58344 Change-Id: I7ac1dbfaf6e3dab8581fe4b33c814e2517fcdba8 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Doc: updated QString::fromRawData documentation to QRegularExpressionSamuel Gaist2017-01-232-3/+3
| | | | | | | | | | | | | | | | QString::fromRawData code sample still shows the use of QRegExp. This patch updates it for QRegularExpression and cleans the code. Change-Id: Iff0f736cdbdd7d35c65fde1496ce9f838a8f5c6d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>