summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* moc: Fix parsing of digit separatorOlivier Goffart2017-03-082-8/+12
| | | | | | | | | [ChangeLog][moc] Fixed parsing errors in presence of C++14 digit separators. Task-number: QTBUG-59351 Change-Id: Iea38ea7388853d84b819c2beb78a59371f57bf7d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add feature.abstractsliderStephan Binner2017-03-089-16/+41
| | | | | Change-Id: Ib5d0186162fc3b750e6440c74b1181787093ef97 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Doc: QSizePolicy: Fix documentation warningsTopi Reinio2017-03-081-1/+1
| | | | | | | | | warning: Can't link to 'controlType()' warning: Can't link to 'horizontalPolicy()' warning: Can't link to 'verticalPolicy()' Change-Id: I6b31acebf183defee7b4ab36976034ed4a3fc98a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Document QT_DEPRECATED_WARNINGSKai Koehne2017-03-081-0/+13
| | | | | | | Task-number: QTBUG-58468 Change-Id: I0f822c2dd14878d70b74ddd2db89b11ba54f687b Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Avoid QRgba64 arrays in the generic text-rendering routinesAllan Sandfeld Jensen2017-03-081-8/+8
| | | | | | | | Like in other functions, allocate arrays of quint64 instead of QRgba64 to avoid the cost of initializing large arrays on every small scanline. Change-Id: Ie132b3157003a18a444ca5c4f94ae668d17327fd Reviewed-by: Gunnar Sletta <gunnar@crimson.no>
* QHstsPolicy: Replace bool with QFlagsTimur Pocheptsov2017-03-083-6/+25
| | | | | | | | | | | | | | | As pointed out in the previous code-review: Replace a bool ctor parameter with QFlags<enum> to conform to Qt API Design Principles (Boolean Parameter Trap). Since the bool with its many unwanted implicit conversions is gone from the ctor parameter list now, drop the explicit keyword again. It was requested because of the boolean parameter in the first place. Change-Id: Ibaf287a6a3e38c22f033fd5d9e024c54f30a1fd4 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Windows QPA: Better recover from removed screens when fullscreenJocelyn Turcotte2017-03-081-4/+10
| | | | | | | | | | | | | | | | | | | | QWindowsWindow::handleResized would call isFullScreen_sys which checks if the window's screen geometry matches the one of the window. When switching back from fullscreen, Windows will have set the geometry to fill the next window, but we don't switch QScreen until later in that function, inside handleGeometryChange. This would result in our window to take the whole screen geometry, but the FullScreen state wouldn't be transferred to the new screen. Fix the issue by using screenForGeometry and check if we are fullscreen on any screen. Also make sure that we check the validity of m_savedFrameGeometry when restoring after a screen remove, since we would previously restore to an area not covered by any screen anymore. Change-Id: I43bc02738007918e9a26c1d27a699c51d3365034 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix computegles31 examplePaolo Angelelli2017-03-083-48/+82
| | | | | | | | This patch fixes the example that contained problems showing up with mesa/nouveau drivers. Change-Id: Ic90f6028e394138781f00bcc00c145c56134f441 Reviewed-by: Gunnar Sletta <gunnar@crimson.no>
* QWidgetWindow::event(): Call base implementation for QEvent::WindowStateChangeFriedemann Kleint2017-03-081-0/+1
| | | | | | | | | | The base implementation takes care of updating visibility and emitting signals. Task-number: QTBUG-59313 Change-Id: I270b37c894420902488d89dc0c79f4c12b8d9a29 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Add documentation for QMAKE_LINK variableAndy Shaw2017-03-081-0/+9
| | | | | | Change-Id: I39f11f42750c705feabf5e1a87bcd277693af1fb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QStyleSheetStyle: introduce class Tampered<QPalette|QFont>Marc Mutz2017-03-082-30/+34
| | | | | | | | ... as a replacement for two QPairs and move some common QFont/QPalette functionality into it. Change-Id: Iaab92130dd54eaa7900ac2048014a80cbd04bfb6 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix MSVC Makefiles when SOURCES is emptyJoerg Bornemann2017-03-071-2/+0
| | | | | | | | | Call sites of NmakeMakefileGenerator::writeResponseFileFiles expect that the output is terminated with '\n'. Do not bail out if files is empty. Task-number: QTBUG-59305 Change-Id: Id3fef8dbc506dad1868e6b352119f5f27b50a368 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: Replace std::bind() with lambdas in Qt ConcurrentSze Howe Koh2017-03-076-72/+17
| | | | | | | Lambda functions provide all the benefits of std::bind() plus more Change-Id: Iec30b20bb35ac0fae560435b323f80af2f2e5fce Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QtXml: add some missing Q_DECLARE_TYPEINFOGiuseppe D'Angelo2017-03-072-0/+8
| | | | | Change-Id: I4b58aad1c337fe5fdfb70eb517a66b15a34dffc4 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Add feature.pushbuttonStephan Binner2017-03-0616-13/+106
| | | | | Change-Id: I654d91635e60b177df16f6dfe00acc940132f66a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add feature.checkboxStephan Binner2017-03-069-7/+52
| | | | | | Change-Id: Ib387390b796c3cab6de4ce94e0d217280a300df8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add feature.dialogbuttonboxStephan Binner2017-03-0614-11/+75
| | | | | | Change-Id: I8c136024c3bf431529033a806be646d867919daa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Build fix for -no-feature-formlayoutPaul Olav Tvete2017-03-061-1/+1
| | | | | | Change-Id: I10a1c4b742bb446f7baa219d4118a03d9f60495c Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove unused src/tools/moc/mwerks_mac.* filesOlivier Goffart2017-03-062-281/+0
| | | | | | | | | These files are unused. They still contains Qt3 code (QCString for example) Task-number: QTBUG-59302 Change-Id: I661f08db4092311df1d6c7d54b9780d86adab8aa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QStaticByteArrayMatcher: enforce alignmentThiago Macieira2017-03-061-0/+1
| | | | | | | | | The data is 256 bytes, so might as well align it on a 16-byte boundary to facilitate copying (if that happens). We should consider similar for QByteArrayMatcher in 6.0. Change-Id: I74966ed02f674a7295f8fffd14a8c64526d734bb Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Make new QtCore code conform to the coding styleThiago Macieira2017-03-061-1/+2
| | | | | | Change-Id: I74966ed02f674a7295f8fffd14a8c6389da538c1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QLineEditPrivate: introduce SideWidgetLocation classMarc Mutz2017-03-062-16/+22
| | | | | | | | | | | | ... as a replacement for QPair<enum, int>, and move some repsonsibilities into it. This avoids the repeated use of the magic number -1 to indicate invalid locations and does away with the confusing .first and .second, replacing them instead with proper names, .position and .index. Change-Id: If904c5333cecf8ce3d5160ca4be9264a13a2b72a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Make uic handle -no-feature-shortcutPaul Olav Tvete2017-03-064-3/+13
| | | | | Change-Id: I0f8c9fdc8b0fe573443cfc126f21e473544ddcba Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add feature.label and feature.formlayoutStephan Binner2017-03-0318-24/+125
| | | | | | Change-Id: Ic8dc0aee7f3fc0d8218ba709352b1378078c6070 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* xcb: stringify enums for tablet qt.qpa.input.events qCDebugShawn Rutledge2017-03-031-4/+18
| | | | | | | | It's a bit easier to read, not having to look up TabletDevice and PointerType enum values manually. Change-Id: I53353be4dcea3e2cb875f04250502ffe802fc971 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Increase timeout of tst_QProcess::softExitInSlots even moreJoerg Bornemann2017-03-031-1/+1
| | | | | | | | | | Commit eab7efd1 increased the timeout for this test, but apparently 10 seconds are still not enough. Set the timeout to a minute. Task-number: QTBUG-59075 Change-Id: Iebab8e5c73c4858ca90063a82aedfbb2546a62cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove library feature condition from the imageformatpluginKimmo Ollila2017-03-031-1/+0
| | | | | Change-Id: I951ec5fa6d5788accdc82327326d39aac540bd7b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add feature.radiobuttonStephan Binner2017-03-037-5/+36
| | | | | Change-Id: Ie11f178ce22e2fafdfdf1760288e90563569e0cb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Revert "Add expandingListItems property to QListView"Marc Mutz2017-03-034-70/+4
| | | | | | | | | | | | | | | | | | | This reverts commit a4c25c020554527aa9ff9b533afabffef46be131. The API is too limited in scope, and a good name is hard to find, as evidenced in the API review discussion preceding Qt 5.9 beta. This API will hopefully return as something like setItemAlignment(). [ChangeLog][QtWidgets][QListView] EDIT: REMOVE: Added expandingListItems property. Conflicts: tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: I397acd8a7a6c716e2d3c96eee45a276eb6d4f9dd Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
* Make "finger touch" not be a tabletAlbert Astals Cid2017-03-031-0/+2
| | | | | | | Otherwise QTouchDevices::devices() doesn't return the touchscreen on my Thinkpad Yoga 460 Change-Id: Ibb829df95f92152a77c512e4325522825901074e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix build with -no-openglPaul Olav Tvete2017-03-035-8/+17
| | | | | | Change-Id: I6fb61944ef88e328a94ea6b7ab42db271828a602 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-0310-10/+28
| | | | | Change-Id: I99144b114b3c2eacb56b522b3059aa53a6bbd969 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* config.tests: Replace LGPL21 with LGPL license headerKai Koehne2017-03-032-27/+39
| | | | | | | Also use canonical contact url. Change-Id: Ia1f814ce822d247f3af14c1ea46e07cfad0fda09 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* mkspecs: Replace LGPL21 with LGPL license headerKai Koehne2017-03-0314-190/+274
| | | | | | | Also use canonical contact url. Change-Id: I04c403f81bb8a8d6d6222573030d1e6d09ec4c3d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Gui: Replace LGPL21 with LGPL license headerKai Koehne2017-03-033-42/+60
| | | | | | | Also use canonical contact url. Change-Id: Ic0bf112998707844eb0c2853d7516b76f4d5afa8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Testlib: Replace LGPL21 with LGPL license headerKai Koehne2017-03-032-28/+40
| | | | | | | Also use canonical contact url. Change-Id: I7ffe7a8afa28fe8b66e00bc5e51595edeac042a9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* BSD plugins: Replace LGPL21 with LGPL license headerKai Koehne2017-03-037-96/+138
| | | | | | | Also use canonical contact url. Change-Id: I27cee9135228dabcf1ece5dcf15db18a2aa536f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* GTK3 plugin: Replace LGPL21 with LGPL license headerKai Koehne2017-03-032-29/+41
| | | | | | | Also use canonical contact url. Change-Id: I6e925378ef4e82bdc739d23186d2dd6f23370d7a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Replace outdated BSD license textKai Koehne2017-03-0311-19/+129
| | | | | | | | For examples and documentation, use new BSD license text that includes the commercial licenses. Change-Id: I1cd74bd8e9c8f2746d8702df00780ee100cbebac Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* winrt: Fix potential warningMaurice Kalinowski2017-03-031-1/+1
| | | | | | | | fix warning about non-portable-includepath due to case insensitivity on windows file system. Change-Id: Ib92db836910c2b9d06a18c841e7c6f0c2e9abab4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* winrt: Fix compiler warningMaurice Kalinowski2017-03-031-0/+2
| | | | | | | The drag event handler classes should have virtual destructors. Change-Id: Ia011856eec37ed303649a1eda036c52f5fa9f8e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix DPI of QWidget with parent on a different screenOlivier Goffart2017-03-022-11/+9
| | | | | | | | | | | | | | | | | | | If a floating QWidget has a parent on a different screen, its DPI was still inherited from the parent instead of taken from the screen. The only reason we did was in case there is a customDpi set. (customDpi is a private thing that is only used in designer to change the appearance of the previewed widget) So instead of recursing into QWidget::metric for each ancestor, just use a for loop to find if one parent has a customDpi. If no customDpi is found, then return the DPI of the right screen. Task-number: QTBUG-58959 Task-number: QTBUG-48242 Change-Id: Ie6e9e48cdd10234994c0919ba3aea9b0cdb52494 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QRegularExpression: build fixGiuseppe D'Angelo2017-03-021-0/+2
| | | | | | | | | Latest PCRE2 versions require a macro to be defined before including pcre2.h, so do it. Task-number: QTBUG-59226 Change-Id: I472ff557e29d1212fdcd99454778551323be4d4b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix grammar in QIcon docsMitch Curtis2017-03-021-2/+2
| | | | | Change-Id: I170662de5dde32a913acc5b681c2d2cefcb51a70 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Mirclient: only enable if desired. Depend on content-hub>=0.2.0Gerry Boland2017-03-021-1/+2
| | | | | Change-Id: I65050e7924b6f7564664e8f4c7270ddad5717336 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* ppm/pgm image formats: fix reading 16bit and limited rangeEirik Aavitsland2017-03-022-14/+121
| | | | | | | | | | | | | The color values of ppm and pgm images can be either 8 or 16 bits. They can also be scaled to a smaller max value, and they can be expressed either binary or ascii. For some of these permutations, Qt's image handler lacked implementation or would decode the wrong color value. This commit fixes that. Task-number: QTBUG-18262 Task-number: QTBUG-35990 Change-Id: I7cf11c2366244f3a9b31c1a565a81e2658bc6a51 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove unused QDBusConnectionPrivate::checkReplyForDelivery()Marc Mutz2017-03-011-3/+0
| | | | | | | It's referenced nowhere, and wasn't even implemented. Change-Id: I3c43c4733f82f98f2af451460270b519474be6ed Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add feature.scrollerStephan Binner2017-03-017-14/+32
| | | | | Change-Id: I5313e1f5091d5764994525dae138e288e5125c59 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Doc: Remove references to pre-C++11 recommendationsOlivier Goffart2017-03-012-16/+2
| | | | | | | | | Compiler support for lambda functions and variadic templates is required since Qt 5.7, so no need to mention in the documentation what happens if the compiler doesn't support it. Change-Id: I5caeaa0bd7f0edce81e22e22964e0b7dd042c719 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix malformed GL extension name for immutable storageLaszlo Agocs2017-03-011-1/+1
| | | | | | Change-Id: Ice2821d9d9523fa8cd446c009677378d52f61ad5 Task-number: QTBUG-59189 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>