summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | BareMetal: Fix run configuration display name setuphjk2018-03-226-37/+28
| | | | | | | | | | | | Change-Id: I0ba784a4d775730277ec0b21aef649011f37b739 Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io>
* | TextEditor: Fix default context menuEike Ziller2018-03-222-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text editor implementations that did not do anything special with invoking their context menu, including our plain text editor, only had Qt's default context menu, without Qt Creator's clipboard history and BOM actions. Make the default actions in our custom context menu more similar to Qt's default actions by adding Undo, Redo and Select All, and not hiding disabled actions, and use that by default in all text editor implementations. Change-Id: Idd5fb276dcd652223d96536dacde8110f9eb576f Reviewed-by: David Schulz <david.schulz@qt.io>
* | Be a bit more perl-like with regular expression replacementsEike Ziller2018-03-221-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now use QRegularExpression and state Perl compatibility. - & and \& expand to & - $<number> exapands to capture group at position <number> - $$ expands to $ - $& exapnds to whole match - \<number> and $<number> expand to nothing if <number> is greater than number of capture groups Task-number: QTCREATORBUG-9602 Task-number: QTCREATORBUG-15175 Change-Id: I17cea3239abaf130626f2bf224aabf0e9b1c6cef Reviewed-by: David Schulz <david.schulz@qt.io>
* | Plugins: Re-categorize plugins which are in "Qt Creator" categoryRazi Alavizadeh2018-03-2010-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Category of DiffEditor, ImageViewer, Macros and UpdateInfo was removed, i.e., they were moved to "Utilities" category. Category of other plugins that were in "Qt Creator" category, changed to "Core". By this patch, forks of QtCreator don't need to change *.json.in files locally. Change-Id: I243c6b1831c0b880d32b2118db71f0b281590b7b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | FilePropertiesDialog: Show mime-type and default editorRazi Alavizadeh2018-03-204-32/+78
| | | | | | | | | | | | | | | | | | | | Added two new rows, Mime Type and Default Editor, to "File Properties" dialog. File properties dialog is a good place to show these information. Change-Id: I131b17a18679b1b94880b8f109fe166500ca34ef Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Restore extra editor windows when opening sessionEike Ziller2018-03-204-6/+68
| | | | | | | | | | | | Task-number: QTCREATORBUG-13840 Change-Id: Idf87d0fd2d0b20f8239487a1c7bf31ea63456d42 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Clang: Add lastModified to the precompiled headerMarco Bubke2018-03-206-32/+36
| | | | | | | | | | | | | | | | It is important to know then the PCH generation started, so we can compare the header file time stamps against it. Change-Id: Id8ee91e886c153d9d4a37cc0438c682f2098f7fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Check that follow symbol QFuture is not cancelledIvan Donchevskii2018-03-201-0/+2
| | | | | | | | | | | | | | We can't take QFuture result if it's cancelled. Change-Id: I493e083c0d35e753d1b2616caf2081f472393e34 Reviewed-by: David Schulz <david.schulz@qt.io>
* | CustomExecutable: Improve tool tip on working directoryEike Ziller2018-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | Do not set a base path on the path chooser. There shouldn't be a base path since that effects the path chooser's expanded path, which is never used for the working directory. Task-number: QTCREATORBUG-13576 Change-Id: Ie7735dc726b442d97b2108e8d340d904c70aa5a6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Utils: Watch file replacements with FileSystemWatcherUlf Hermann2018-03-201-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite common for other programs to remove and re-add a file in order to change it. QFileSystemWatcher does not track this, but silently drops the file to be watched. Add a directory watcher for each directory with files to be watched and if that triggers, examine if one of the files we are watching in that directory has been re-added. If so, generate a fileChanged() signal. This still doesn't track replacements of directories. If we want to track those, we could apply the same technique to directory watchers, but we'd have to recursively watch directories down to the file system root. Change-Id: I8a70b76bb34502dcfac390ba90e715918d7a5b4a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Simplify DesktopQmakeRunConfiguration::updateTargetInformation() a bithjk2018-03-202-17/+5
| | | | | | | | | | | | | | No need for looking up buildTargetInfo twice. Change-Id: I730d7e827d9b5e81a2174ca763c3a89b24389742 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Search Results: Fix expand all button state at startupEike Ziller2018-03-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | It was enabled at startup even though it should only be enabled if actual search results are shown. Do not set the enabled state on the button, but on the local action instead. The button has the Command's action as its default action, and the state of that action can be overridden by the local action's state at context change. Change-Id: I045d022836b12375dc49d4ee0ffd4802d795db3b Reviewed-by: David Schulz <david.schulz@qt.io>
* | Drop QFileInfo::exists() check before trying to run an executablehjk2018-03-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Physical existence of a file is not strictly needed for something being runnable, e.g. 'foo' can be used to start a process on windows, even when only 'foo.exe', but not 'foo' itself exists. On the other hand, the existence of the file is not sufficient either to run it, so the check was too weak and too strict at the same time. Change-Id: I4a41d2f5cbb0cb471023a8bc23628072b28a5984 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Fix compilation before it breakshjk2018-03-192-0/+3
| | | | | | | | | | | | | | | | Make #includes self-contained, anticipating breakage in the upcoming removal of projectexplorer/runconfiguration.h in qmakeproject.h Change-Id: Ia166ccb3c830c3cc6f50181690ba281d4a705de8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | WinRtRunConfigFactory: Use base method to list run configshjk2018-03-195-29/+8
| | | | | | | | | | Change-Id: I444b676d522cea88f024d33d56ce407341c12274 Reviewed-by: David Schulz <david.schulz@qt.io>
* | CppTools: Remove processEvents call from follow symbolIvan Donchevskii2018-03-1922-128/+199
| | | | | | | | | | | | | | | | processEvents is a bad way of dealing with asynchronous requests. Use QFutureWatcher for that purpose. Change-Id: I3839cb9db80a6d391f6af1178e96986a325b7b99 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | ProjectExplorer: Create clang-cl toolchain also for CIvan Donchevskii2018-03-191-3/+5
| | | | | | | | | | | | | | clang-cl can build both C and C++. Change-Id: I173b4e9e8f1726f328fd7af5782435566be5b932 Reviewed-by: David Schulz <david.schulz@qt.io>
* | ProjectExplorer: Add support for clang-cl based on MSVC2017Ivan Donchevskii2018-03-191-6/+35
| | | | | | | | | | | | | | | | Clang is compatible with MSVC2017 since 6.0 version. Task-number: QTCREATORBUG-20087 Change-Id: I5403790c02a7dc04a58f30078fc7abac5755826e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Clang: Add combobox with tidy configuration optionsIvan Donchevskii2018-03-197-109/+323
| | | | | | | | | | | | | | | | | | The old way was not flexible enough. With these options it's possible to just use your config file or set tidy command line yourself. Change-Id: I1bace40986668dee5e1b30c9d03090a3fd22e253 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | ProjectExplorer: Prevent crash on project closinghjk2018-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | Introduced with e20d6200436d, currentProject will be null when a project gets closed. The previous code path had access to a locally cached and still valid pointer to the project that's about to be closed. Change-Id: I3260b4ed1ac325fc2be0e8bba934d7888b1d698c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-192-1/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
| * ProjectTree: Add missing registration of pre-existing projectsTobias Hunger2018-03-161-1/+3
| | | | | | | | | | | | | | | | | | Register pre-existing projects when opening a new Project View. This fixes missing parsing state on newly opened Project Views. Task-number: QTCREATORBUG-20058 Change-Id: I47cd4791c1b8eac7717a7ce2b35d7f35bba5826a Reviewed-by: hjk <hjk@qt.io>
| * Fix scrolling in file system viewEike Ziller2018-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | The style can set the scroll bar to scroll by item, which breaks the automatic scrolling that adapts for size changes of the bread crumbs. Force the tree view to allow pixel-exact scrolling. Task-number: QTCREATORBUG-19800 Change-Id: If61640a1b6e3b4a777269fb129bdc2689bad19c2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Nim: Fix typoRazi Alavizadeh2018-03-192-3/+3
| | | | | | | | | | | | | | Fix a typo: Rename matchMultiLineCommendEnd() to matchMultiLineCommentEnd() Change-Id: I2c1a5280c8abb05b9f76d0d8cce138d8a40ad014 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Use angle on WindowsThomas Hartmann2018-03-191-0/+5
| | | | | | | | | | | | | | | | | | Many OpenGL drivers are still very unstable and we see many issues. Task-number: QTCREATORBUG-20067 Change-Id: Ifc1d5b2666f9cc69154032c3c4534cd96194110c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Enable Clang code model by defaultEike Ziller2018-03-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been around for a long time now, many e.g. windows specific issues have been fixed, and we concentrate our development effort on it. Many bugs in the built-in model stay unfixed, and we'll definitely not support modern C++ there, which leads to many bug reports that are closed with "works in clang code model". Let's switch that around. Task-number: QTCREATORBUG-19297 Change-Id: I59ec9621ad76590db8ec33f9658af6d103c9da93 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | CMake: Some cosmetics to move closer to default stylehjk2018-03-162-16/+9
| | | | | | | | | | | | Change-Id: If2c36eda6157e5dd78abf4f25029ecfd153e228a Reviewed-by: pawelrutka <prutka13@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Qmake: Remove now-unused QmakeProject::hasApplicationProFilehjk2018-03-162-7/+0
| | | | | | | | | | Change-Id: Ie309468a124497c0aafa3911b5bd6939a9adcb3d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | CMake: Compile fixhjk2018-03-161-1/+2
| | | | | | | | | | | | Change-Id: I3f9d07490ab98ec1f5e0d0acd9def2d02010ea12 Reviewed-by: pawelrutka <prutka13@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | TargetSetupPage: Work for projects without BuildConfigurationTobias Hunger2018-03-164-51/+64
| | | | | | | | | | Change-Id: Ie145bc3c87f01326a25e75f5c80a4d05da58bf6b Reviewed-by: hjk <hjk@qt.io>
* | AutoTest: Add possibility to trigger test run from sourcePawel Rutka2018-03-1610-18/+132
| | | | | | | | | | Change-Id: Iceed69747de64d76f34451d41f719c8dbdd81e44 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Add Specific settings page to CMakePLugin and create checkable dialog box ↵Pawel Rutka2018-03-1611-17/+443
| | | | | | | | | | | | | | | | | | for user after add new file action Change-Id: If5702764fa81f2fdda3ef59780b217e47643b030 Reviewed-by: pawelrutka <prutka13@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.6'"Eike Ziller2018-03-1649-743/+1250
|\ \
| * \ Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-1649-743/+1250
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/androiddeployqtstep.cpp src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp src/plugins/qmakeprojectmanager/wizards/testwizard.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/gettingstartedwelcomepage.cpp Change-Id: I126823f5f60613509520c07f52be7bc9d4f4367c
| | * Fix image border for examples browserEike Ziller2018-03-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was made smaller for the tutorials to fit the new aspect ratio for their images, but we may not do that for the examples. Fixup for 7d834729065668 Task-number: QTCREATORBUG-20078 Change-Id: I556536a7e299e8f675332cd7450ece5fca6fab0a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * Move git specific stuff out of diff editor pluginJarek Kobus2018-03-1513-186/+370
| | | | | | | | | | | | | | | | | | | | | Move it to the git plugin. Change-Id: I8151573ed50df70776f7ebf0475dd41fb84fae83 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * Update qbs submoduleChristian Kandeler2018-03-151-0/+0
| | | | | | | | | | | | | | | | | | | | | To HEAD of 1.11 branch. Change-Id: I12a6938563f7c7b109146123137aa7d278310fcb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * QmlPuppet: enable reset the default puppet buttonTim Jenssen2018-03-151-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the logic that empty means that it should use the default fallback puppet. Task-number: QTCREATORBUG-19511 Change-Id: Ia36907523281386a1ed56362a76e37aaa9ee16b2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * Fix width calculations in flamegraph and timelineUlf Hermann2018-03-153-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relying on the index of a detail entry in the children array is dangerous as the repeater may create the children in any order. Rather, use the isLabel property to find out if an item is a label. Also, recognize that the drag handle sits in the outer margin. Therefore, as the minimumWidth includes margins, we have to subtract one margin in order to get the x value of the handle. Task-number: QTCREATORBUG-20012 Change-Id: I828b116c2c52d5aa7f8e3e726f59e3fa9f9095ec Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * QtSupport: Fix loading of tutorial thumbnailsv4.6.0-rc1Alessandro Portale2018-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Amends 7d83472906566857f9afaa95440a41d1ed5edcae Used the HighDpi loader in the wrong place. Change-Id: I5bb7328167c0a9da811db92102feea67ee97c6c4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| | * qmake: require a drive in a DOS path for it to be absoluteEdward Welbourne2018-03-143-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Q_OS_WIN, a path is only truly absolute if it includes a drive letter; merely starting with a slash is not enough. (We can't support UNC paths, so don't even try: qmake runs various commands in the source directory using CMD.exe, which doesn't support UNC as PWD.) This requires, when resolving a path relative to a root, transcribing the root's drive to such not-quite-absolute paths. Changed QMakeGlobals, $$absolute_path() and $$relative_path() to now use IoUtils::resolvePath() rather than delegating to QDir's absolute path method, since that doesn't correctly recognize the need for a drive letter (and qmake did run into problems with some paths, from splitPathList and a failing test, as a result). Change-Id: I2bfc13c1bfbe1ae09997274622ea55cb3de31b43 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> (cherry picked from qtbase/e86f3c018833141776db2d15772ba53995656eac) Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: fix hypothetical raw data leak in $$replace()Oswald Buddenhagen2018-03-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the replacement value may well constitute the whole output string - this is in fact common, given this rather typical usage pattern: BAR = $$replace(FOO, -flag, -otherflag) this must be considered when constructing the return value. compare e1cee308a. as of now, this is irrelevant, as QString::replace(QRegExp, QString) will always memcpy the replacement into a detached copy of the target, but one never knows. Change-Id: Ia1f271f45023746040fc28ce6d88a6609e05e5c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/e8b9a17a3bd770f6bf1bc8f4e0586565acf425e2) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: fix hypothetical raw data leaks relating to qt i/o classesOswald Buddenhagen2018-03-141-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | technically, we should not rely on the i/o classes not storing the strings beyond the instantiated object's life time. Change-Id: I0990769b3cf86860184869036c096c531160e9be Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/702be65532263bd52ad0b67235c112083120699e) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: remove pointless use of raw data in $$[QMAKEFEATURES] accessOswald Buddenhagen2018-03-142-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property values are de-facto guaranteed to be backed by full QStrings, so there is nothing to be gained from using the raw data optimization, while doing so risks raw data leaks. Change-Id: I3d43da9aaadd4d5811c4b1a9d7ac734049da423c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/18533ae2a72aba9ad8c0f1862e1e6ace50655864) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * optimize operator+ ProString vs. char*Oswald Buddenhagen2018-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have all necessary overloads now. Change-Id: Ic4472eba15d4234e968fcb9443d0f79011aa43fd (cherry picked from qtbase/f137957e0887a9321b69b9ba83ed6ccaedee57bb) (cherry picked from qtbase/14505bbfea220a39c2158480db8ba788707ff332) Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: make more use of ProString built-insOswald Buddenhagen2018-03-142-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | saves some noisy toQString() uses. Change-Id: I62a9e2725c4baabac311124d19c7d8b40f54c8f7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/ce5e6876d4a191087969134e489db99cf167ca69) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: fix raw data detach avoidanceOswald Buddenhagen2018-03-143-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the m_tmp array is a member, so the index toggle for accessing it also needs to be one - otherwise, odd iteration counts will defeat the mechanism. Change-Id: If7a800ed5a4b4168625daf1ebbd5d2d164569d8e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/ccb8afcda752093bfb6bc32f560131a91bd826a1) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: fix excessive detaching of raw dataOswald Buddenhagen2018-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in $$basename(), $$dirname(), and contains(). the latter case is marginal, as it only applies to mutuals which are regexes, which i don't remember ever seeing used. QRegExp saves a copy of the matched string, so it's necessary to alternate between two temporaries to avoid detaching. we already did that in most places. Change-Id: I97b8294585c17c76d1756f83971f42cb88353af0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/5131bb9bed3af7a2ecfce27af3940ff11ed219c2) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: make yet more use of ProString::toQStringRef()Oswald Buddenhagen2018-03-145-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in most cases, the main advantage is not using toQString(m_tmp), which reduces the possibility of raw data leaks. in cases where we used toQString() without temporary, this is a slight optimization. Change-Id: Ib343acffd383aa2c4fefab75fb52762fb534dfc6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/eb0ba90b0af9fa7d5b70c74140f64295f2d05c18) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * qmake: Change source identifier type in ProStringOswald Buddenhagen2018-03-1417-185/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strings remember in which file they were created/assigned. However, this used a non-counting reference to a ProFile, which could become dangling. If a subsequent ProFile re-used the exact same address, a string's source would be mis-identified, which would be fatal in conjunction with discard_from(). Since we actually need only a unique id for comparison, let's use an integer for that. comment on cherry-pick: this is actually a lot more than a cherry-pick, because the file ids need to be aware of the dual VFS which was concurrently introduced on the qtc side. Started-by: Simon Hausmann <simon.hausmann@qt.io> Change-Id: I395153afaf7c835d0119690ee7f4b915e6f90d4a (cherry picked from qtbase/190aa94be7f5e146bef44862b974d733755cec85) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>