Commit Graph

100 Commits

Author SHA1 Message Date
Cristian Adam
76dcc069d6 CMakePM: Add source groups to auto-setup.cmake
The CMake "Resources" source group is being extended with "*.qrc *.svg
*.gif *.ico *.webp"

The "Forms" and "State charts" are taken from QMake and group "*.ui" and
"*.scxml".

Fixes: QTCREATORBUG-31308
Fixes: QTCREATORBUG-31312
Change-Id: Ie83c185769637f70731ef775cda16a61de708b20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 16:04:02 +00:00
Eike Ziller
f6e99a6235 Remove Linguist related external tools
They do not work with CMake projects

Fixes: QTCREATORBUG-28467
Change-Id: Ic656c28d0e6bdde976bf7ffd75796b51c1aba06a
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-07-10 13:50:33 +00:00
Cristian Adam
d13a7dc9b5 CMakePM: Update cmake conan for auto-setup
Update to https://github.com/conan-io/cmake-conan/commit/
f6464d1e13ef7a47c569f5061f9607ea63339d39

Task-number: QTCREATORBUG-30169
Change-Id: Ibb8f3d353117c5c8ce21b8686cb6e2e5ee146698
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-19 08:30:47 +00:00
Cristian Adam
0d40cc5093 CMakePM: Fix conan generators path using backslashes
This can cause issues with CMake, since CMake uses slashes as directory
separator.

Fixes: QTCREATORBUG-30326
Change-Id: I0c03b3bcd32bddc99fb361eb8e6aaffd0b1f10b6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-09 10:41:59 +00:00
Eike Ziller
3e40f227f5 Merge remote-tracking branch 'origin/12.0'
Change-Id: I70bcac4195095a7646dcdc31532d8f61b643d869
2024-01-10 16:06:29 +01:00
Cristian Adam
7fdfc2ac1d Auto-Setup: Forward CMAKE_MSVC_RUNTIME_LIBRARY to package manager
Fixes: QTCREATORBUG-30169
Change-Id: Icfbb497e067c5a5a4b57e91c9fa50bc0a2816bc3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-09 13:05:04 +00:00
Eike Ziller
cf63b1884e Merge remote-tracking branch 'origin/12.0'
Conflicts:
	src/libs/utils/treemodel.cpp
	src/libs/utils/treemodel.h

Change-Id: I9c5e8ef77905745c201cfc647218c9e747d268d6
2024-01-08 14:56:54 +01:00
Cristian Adam
f5fd5f1fd3 CMakePM: Fix Conan iOS/macOS package manager auto-setup
CMAKE_SYSROOT is used by Qt Creator for cross-compiling, and also
selecting toolchain on macOS.

Whilst for iOS CMAKE_OSX_SYSROOT is used for the same task.

Make sure to pass these CMake variables to conan via the generated
toolchain file.

Qt Creator also uses for iOS the Xcode generator, which is a multi-
configuration generator. This patchset will set the "Debug" and "Release"
configurations that usually conan scripts use.

Fixes: QTCREATORBUG-29978
Change-Id: I23c5d94f830aaf81c5d27f821c09545ddfd45df6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-05 10:13:33 +00:00
Eike Ziller
2ce9f9d97d Move most acknowledgments to qt_attributions.json
Create a qt_attributions.json and generate a documentation file from it
automatically when building documentation. The result is included as a
table in the acknowledgments page in the documentation.

Some attributions cannot (yet) move to qt_attributions.json, because
that requires the sources to be available in the project's source tree,
which is not the case for LLVM, Clazy, etc.

Remove the attributions from the README and instead point to the
documentation from there, so we get rid of that duplication.

Change-Id: I22623fe7495593ffce2e2c6c26255c27c5a8cb71
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-12-15 09:02:23 +00:00
Cristian Adam
13dc66a08d Fonts: Add Medium SourceCodePro font variants
Add the Medium font families.

The Medium variants make sure that on a MacBook Pro with Retina display
the font doesn't look out of place being too thin.

Taken from https://github.com/adobe-fonts/source-code-pro/releases/tag/
2.030R-ro%2F1.050R-it

We need to stay with version 2.0.30 due to hinting on Windows, and to
force QFont::Medium on macOS due to the fact that the medium font is not
picked up. Newer versions like 2.0.42 do not have this issue.

Task-number: QTCREATORBUG-29964
Change-Id: I4c0fba5730c4a6b869d900642b675698c29c6ae8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-04 13:37:02 +00:00
Cristian Adam
42cc29902b CMakePM: Detect C/C++ object extension for single source build
When using CMake package manager auto-setup the CMAKE_C|
XX_OUTPUT_EXTENSION is stored in the CMake cache.

This way CMake project manager can know about the correct extension when
building a single source file.

If CMAKE_C|XX_OUTPUT_EXTENSION is not found in cache it will only use
".obj" for Clang-Cl/MSVC/MinGW toolchains.

Task-number: QTCREATORBUG-27471
Change-Id: Ib9b75608d5a6834014150c57f3098f79284d8276
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-11-05 11:56:22 +00:00
Cristian Adam
a071d4354a CMakePM: Save CMAKE_MODULE|PREFIX_PATH in cache for vcpkg
This would allow the user to see the paths set by vcpkg.

Change-Id: I6d4ed9a9c69c2296851c8f8363b78d5adb7d2723
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-19 18:55:17 +00:00
Cristian Adam
b5d0c5dd36 CMakePM: Save CMAKE_PREFIX|MODULE_PATH as cache variables for conan
This way it's visible in the project settings where the Conan paths are
added.

Change-Id: I95aa59c836bf3b9ed122e9bffdd61b0dd3c7354e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-19 18:55:00 +00:00
Cristian Adam
70e9c2685f vcpkg: Set VCPKG_ROOT environment variable for Qt Creator process
This way CMakeProjectManager's auto-setup.cmake would pick it up and
find vcpkg.exe

Change-Id: Iafa84f13e0f50321ce771fc687ecc9e2df148de7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-17 18:10:52 +00:00
Cristian Adam
879692381f CMakePM: Fix conan default profile auto-detection
CONAN_COMMAND was not available for `conan_profile_detect_default`
function.

Change-Id: I03df06aa88e6588101bb5ec54b3ce2cb64dee2c8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-17 13:54:17 +00:00
Marcus Tillmanns
ab23ee98f9 PackageManager: Search for vcpkg in project root
Change-Id: I467476e6897f36558afc76a262f631cdaa47320e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-10-17 11:43:57 +00:00
Cristian Adam
12a6d9e5dc CMakePM: Update CMake conan to latest version
Url: https://github.com/conan-io/cmake-conan/blob/develop2/
conan_provider.cmake
sha: 451fa97d2c59c07b13fb4812a64b2a6391f9e781

Change-Id: Ia52f5d856cf045d7a1d1871d6d43fd1d014439c4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-16 20:05:21 +00:00
Cristian Adam
09a0c0ec15 Auto-setup: Forward CMAKE_<LANG>_STANDARD to conan/vcpkg
Fixes: QTCREATORBUG-29292
Change-Id: Iee0b0639841d11fa14dcb57c1a4f9b4678aa0e2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-04 16:46:49 +00:00
Eike Ziller
d172e59d6e External tools: Fall back to active project's Qt
for the Qt related external tools, if there is no open document with a
project.

Change-Id: I1d059d70e5163921a8d98b6a93224aef1fbf1743
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-28 06:55:01 +00:00
Cristian Adam
4d82246ab5 auto-setup: Add support for conan 2.0
Fixes: QTCREATORBUG-28865
Change-Id: Ifb801a458b4b18de218dee6604f0555cab13ec75
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-03-17 16:25:19 +00:00
Cristian Adam
61eb25af6d auto-setup: cleanup script
Remove the Qt SDK detection of conan. This is no longer valid with the
scripts being copied to ${buildDir}/.qtc/. Qt SDK also doesn't ship
conan anymore.

Do validation for conan via "conan --version" and vcpkg via "vcpkg
version".

For vcpkg the program path is resolved for symlinks and for Windows the
target architecture is being detected from the compiler path.

Change-Id: If0da79c952392d5ac9f8352e262b0802d6eb9ed3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-09 10:47:16 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Eike Ziller
5ae23f8c66 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
2022-09-13 11:15:16 +02:00
David Schulz
57f80dc813 Downgrade Source Code Pro font
The old version looks crisper. Downgrade to
Roman fonts version 2.030 and Italic fonts version 1.050

Fixes: QTCREATORBUG-28106
Fixes: QTCREATORBUG-28139
Change-Id: Iec077fddf2ddba71b8b2cd7de92f397e12b6dc65
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-12 10:17:09 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Cristian Adam
b2407dbde5 CMakePM: Update conan.cmake to version 0.18.1
This is the latest released version at this moment in time.
It has support for Visual C++ 2022 detection.

Fixes: QTCREATORBUG-27814
Change-Id: Ib4fa288ced1271e1964b2ae0f7d6a6c5e403cf53
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-18 17:16:55 +00:00
Christian Stenger
4de0f1701b Fonts: Provide bold italic font
Linux fails to automatically mix bold and italic styles of
fonts while other OS seem to be able to handle this
appropriate.
Provide a bold italic font to not rely on the underlying
font engine.
As on it update the other fonts to the same version.
(Roman fonts version 2.038, Italic fonts version 1.058)

Fixes: QTCREATORBUG-27355
Change-Id: I68884a11dd33c57372f946dbf9ee05f04b7ebc36
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-04-19 11:51:56 +00:00
Cristian Adam
795d7364df CMakePM: auto-setup.cmake do not fail if QtCreator.ini doesn't exist
There are Qt Creator installations that do not provide
"QtProject/QtCreator.ini" file, and without it the auto-setup.cmake
code would fail.

Task-number: QTBUG-99273
Change-Id: I7674f68bc89375d8065d820b89650a358a7226b2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-26 11:25:19 +00:00
Eike Ziller
9d8a419d10 Remove qmake build files
Removes qmake as a build system for building Qt Creator itself.
Keep them for some tests that are not completely moved to CMake yet.

Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 12:18:15 +00:00
Cristian Adam
05b40bbcd3 auto-setup.cmake: Add QT_CREATOR_CONAN_BUILD_POLICY cache variable
By having QT_CREATOR_CONAN_BUILD_POLICY as a cache variable the users
can change the default value of "missing" to something else like
for example "never".

Change-Id: I8b447c40d1331976d0ee35ecb34b4d68c5742771
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-04 14:03:25 +00:00
Cristian Adam
05c3f965e3 auto-setup.cmake: warn if conan or vpkg executables are missing
Warn the user if the package manager auto-setup doesn't find conan
or vcpkg executables and does nothing.

Some projects will fail, or in the case of Qt modules, will continue
working by using the system cmake packages.

Change-Id: If3b07e619c27a4b637a894690bd248ad98d6dda2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-07 09:35:29 +00:00
Cristian Adam
e08928e4f7 auto-setup.cmake: Better handling of conan edgecases
Do not try to run the conan executable if conan executable is
not found.

If the conan auto-setup fails warn about it and provide the message
how to skip the auto-setup configuration and do not fail due to the
missing conan_paths.cmake file.

Also print a status message that informs the user that the package
manager auto-setup is performed, with the information how to skip
the step.

Task-number: QTCREATORBUG-25680
Fixes: QTCREATORBUG-25891
Fixes: QTCREATORBUG-25818
Change-Id: I0969ba9b417448f89efd22d7c361e3a54e552ed1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alp Öz <aoz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-09-07 08:52:36 +00:00
Cristian Adam
19fded6a6a CMakePM: Add variables to skip Qt Creator's package manager to cache
This way you will get the variables in the variables list and you only
need to change them from OFF to ON.

This won't fix the tasks below, but it will remove the lookup of the
special variable names.

Task-number: QTCREATORBUG-25680
Task-number: QTCREATORBUG-25891
Task-number: QTCREATORBUG-25972
Change-Id: I8ed1d5c4275516b10f4f10ad63b3de0f6b2ffbc8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-20 12:40:37 +00:00
Kai Köhne
bc988c69fa Fix executable path for QML utility
Amends 453f4996db

Fixes: QTCREATORBUG-26137
Change-Id: Ic5c1688e8a11cffa10504026b303fb1e30a34fc4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-19 06:23:58 +00:00
Cristian Adam
614c9a6cb6 CMakePM: Reference more CMake variables in auto-setup
This will remove the warnings for examples that setup only
the C++ compiler, or when configuring QML debugging.

Amends 1bf9900aed

Change-Id: Ica9361114be420b81f611f5d498d87949399e8b4
Reviewed-by: hjk <hjk@qt.io>
2021-08-05 16:24:50 +00:00
Cristian Adam
1bf9900aed CMakePM: Remove QT_QMAKE_EXECUTABLE warning
By referencing it in the auto-setup.cmake script.

Fixes: QTCREATORBUG-26072
Change-Id: I8b2d06f08da96cfa498f818db4c2428702756516
Reviewed-by: hjk <hjk@qt.io>
2021-08-02 13:58:20 +00:00
Tim Jenssen
453f4996db use "qml" as QML runtime
Since Qt 6.2 qmlscene is deprecated by Qt.

This patch also removes QMLViewer as a last
QtQuick 1 artifact in external tools.

Task-number: QDS-639
Task-number: QDS-4535
Task-number: QTCREATORBUG-22385
Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-13 15:38:46 +00:00
Cristian Adam
ab55fb2446 CMakePM: Fix conan compiler path setup
The conan toolchain.file was not passed to the cmake process that
was setting up conan install, only inside for conan.

Task-number: QTCREATORBUG-21785
Change-Id: I5f315e7de823d4ef3237081da9b294b236fedebb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-28 11:53:46 +00:00
Cristian Adam
169614d8b1 CMakePM: Setup conan path from Qt SDK
Read and prepend the conan path from Qt SDK which is set in
QtCreator.ini.

Fixes: QTCREATORBUG-25553
Change-Id: I1404064ca253cb968d19bca253f1bb781209d0bd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-22 10:44:50 +00:00
Alessandro Portale
173a5b97dd qmake build system: Install share/3rdparty/package-manager
Amends: cc0fa86ffd

Change-Id: I00ca24fa18a10ff9bbbdeb86262c24c32d8dd8f8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-23 16:04:26 +00:00
Cristian Adam
cc0fa86ffd CMakeProjectManager: Add package manager auto-setup
Adds CMAKE_PROJECT_INCLUDE_BEFORE as initial CMake parameters
with a path to a auto-setup.cmake script that will run
conan install if a conanfile.txt is found in the prject.

A project can have a local QtCreatorPackageManager.cmake file
that will be loaded if exists.

The auto setup can be controlled via the following CMake variables:

* QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP
* QT_CREATOR_SKIP_CONAN_SETUP
* QT_CREATOR_SKIP_VCPKG_SETUP

conan.cmake is taken from https://github.com/conan-io/cmake-conan
which takes care of the conan specific compiler cruft. License
is MIT.

Fixes: QTCREATORBUG-25362
Change-Id: I70a6e1abc5600851d048f1590ca24204ce52a503
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-02-19 17:54:45 +00:00
Christian Kandeler
b55825a420 ProjectExplorer: Clean up variables
Global variables with names such as "CurrentProject*", "CurrentKit*" etc
are harmful, because the term "current project" as used in Qt Creator
does not refer to the "active project", but simply stands for the
project that contains the node that is currently selected in the project
tree, which in turn may or may not correspond to the current editor
document, depending on the "sync with editor" setting. In other words,
the "current project" is almost a random value with little meaning
outside the project tree itself.
Therefore, we remove "CurrentProject*" and friends, except the ones that
are currently intentionally in use. The latter get renamed to
"CurrentDocument:Project*", so their purpose becomes clear. Their old
names are kept around for backward compatibility, but are not suggested
by the variable chooser anymore, so new usages are unlikely and we can
remove them at some point.
We also add some ActiveProject* variants that have been requested in the
past.
Also remove the "CurrentSession" prefix that was deprecated six years
ago.

Fixes: QTCREATORBUG-12724
Fixes: QTCREATORBUG-24606
Change-Id: Ibba5d0e0ce3d2beb444a5eec01fbb9b745d90a1d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-02 07:49:08 +00:00
Eike Ziller
b9b2887686 CMake build: Fix copying of external tools
Fixes: QTCREATORBUG-24509
Change-Id: Ic19adf009bba326a2b9e59fe561e4021bbf21412
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-19 10:40:12 +00:00
Alexis Murzeau
a9aa561234 CMake: copy clang and resource files only if necessary
Uses a timestamp file in the build directory to detect when the input
changes using DEPENDS from add_custom_command.

Total copied files size sum up to more than 260 MB. This was copied at every
incremental build, even if nothing changed.

This leads to faster build, especially when the copied files are not
cached in RAM or when not using a SSD.

Change-Id: I3a0b691b961e1d8591068bacf40ae2467c8637cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-11 22:36:30 +00:00
Cristian Adam
f2ce80e0c6 CMake build: Copy fonts and syntax-highlighting files to builddir
Fixes: QTCREATORBUG-22472
Change-Id: Ib812690c70efdc0ad7b125f6ce9623ca500d698d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-13 14:25:50 +00:00
Cristian Adam
d855b84c5d Qt Creator CMake port
Based on Tobias Hunger's work from a few months ago.

The CMake configuration needs libclang and Qt paths specified as
CMAKE_PREFIX_PATH.

Auto tests are run with "ctest". At the moment the pass rate is 87%.

Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-17 13:33:28 +00:00
Thomas Hartmann
940e798a3a Add Welcome Page of Qt Design Studio
Change-Id: I492d27aa5f899630863eb902bf0acc9d9610b80e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-03-06 11:14:02 +00:00
David Schulz
14834e6b0a TextEditor: replace generic highlighter with ksyntaxhighlighting
Fixes: QTCREATORBUG-21029
Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-01-28 11:37:08 +00:00
Eike Ziller
3d1d9aae2e Merge remote-tracking branch 'origin/4.8'
Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
2018-11-19 10:00:18 +01:00
Orgad Shaneh
0f6fcd09de GenericHighlighter: Update from KSyntaxHighlighting
Change-Id: I0ec59359c7f8670a048dfc35264d6ab64bc62ceb
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-11-12 06:30:34 +00:00