Commit Graph

58 Commits

Author SHA1 Message Date
Christian Stenger
07506ab695 KSyntaxHighlighting: Fix qbs build
Amends 37f8fcd791.

Change-Id: I0734e26fc8015eb31d6cbbd86444179ee14c8304
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 09:58:48 +00:00
David Schulz
37f8fcd791 Editor: update ksyntaxhighlighting engine to v5.90.0
Task-number: QTCREATORBUG-22558
Change-Id: I7314c146a6de359ea8d60750d8a2c8e972b33fc9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-11 08:00:00 +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
David Schulz
27ff70fd88 Editor: remove moved file from syntax-highlighting.pro
Change-Id: I30b5bb884274dc2526291826ce5cc823cc5e921d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-27 10:20:42 +00:00
Orgad Shaneh
3871e40f43 Fix qHash-related size compatibility warnings by MSVC
Change-Id: I3b7981ce78b67db4b996f99682284a0b911d8cd7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-20 15:03:51 +00:00
David Schulz
a95ee64fed Editor: Fix build for Qt < 5.15.2
Change-Id: I06d1ec50159f3370fde05633de8e14f599140369
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-20 08:07:17 +00:00
David Schulz
fc11797218 Editor: update ksyntaxhighlighting engine to v5.87.0
Change-Id: If9dab8b321799f0ce908c831e812c20301a714e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-10-19 10:44:16 +00:00
Christian Kandeler
44912450f4 KSyntaxHighlighting: Streamline qbs build
We don't have to build all the source files, and with Qt6, we can't.

Change-Id: Ica16e90160cf4a90612f7bba28a1140d4e8c70a2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-16 09:32:06 +00:00
Christian Kandeler
da8b3f237a qbs build: Prefer KSyntaxHighlighting from system
Note that the system package will only be found with qbs >= 1.20.

Change-Id: I361b774d6b35fdbd0386144d4e9812f02f7841e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 14:30:18 +00:00
Christian Kandeler
f6eba42522 qbs build: Use exportingProduct in Export items
The use of product in Export items is deprecated and will be removed in
one of the next qbs versions.

Change-Id: I2644a69012db4a4b4842066784913f4160d3d80a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 11:40:37 +00:00
David Schulz
8a82c8f4ee Highlighter: adjust Qt6 compile fixes to upstream changes
Change-Id: I0d7962a4a52cbdf5645f30f86bca5457a4c061f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-24 12:55:55 +00:00
Eike Ziller
8a7b9fbdd4 Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: I72ac4dab24021f0272a30400cc801387f0dcb558
2021-03-22 09:24:41 +01:00
David Schulz
5945f1fa18 Highlighter: add new comment rules
Change-Id: I2f98c1374cab90f068db318051af2ea4be57cbae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 10:03:07 +00:00
David Schulz
2c81fe7302 Highlighter: readd autoconf highlighter
It isn't in the public repository of the syntax files, but it still
seems to work.

Amends: 14834e6b0a

Fixes: QTCREATORBUG-25391
Change-Id: I23819bdc79c5b4fab92b1150ed102f742a204e89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 09:59:46 +00:00
Christian Stenger
73ff6996b2 Highlighting: Fix compile before Qt5.15
Amends d4c4f8c007.

Change-Id: I8f6c16b373500ab2fedbc4d43ccfb503565eccbd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 13:40:59 +00:00
David Schulz
9129dffe55 Editor: Qt6 compile fixes for KSyntaxHighlighter
Change-Id: I5f00cb8e948762da8f855059dcf90b7857d57482
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 10:35:39 +00:00
David Schulz
d4c4f8c007 Highlighting: update KSyntaxHighlighting to v5.80.0
Task-number: QTCREATORBUG-22558
Change-Id: I57d782397f88842edbd08b1008b2d88706c6ab52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 10:35:36 +00:00
Eike Ziller
c55e59cb77 Merge remote-tracking branch 'origin/4.14'
Change-Id: Ib9512b4fc5e17b04ca4be79fc315e79a52d06497
2021-02-22 12:19:58 +01:00
Eike Ziller
7cb81fb5ba CMake build: Add .pri files to development package
This adds at least partial, transitional support for building
3rdparty plugins with qmake against Qt Creator built with CMake.

This might still miss some other .pri files that follow
their own naming conventions.

Fixes: QTCREATORBUG-24055
Fixes: QTCREATORBUG-25334
Change-Id: I83cc547da938976c2ec12a21a17f286b937147f7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-22 07:30:33 +00:00
Christian Kandeler
7d4a632cb2 qbs build: Remove code for creating deployment packages
Not a use case anymore, and if it were, we'd do it using built-in
capabilities.

Change-Id: I4c588ad7fb282530880210cb4c5795677074b1e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-17 16:11:49 +00:00
Eike Ziller
d95e1f940a Merge remote-tracking branch 'origin/4.14'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I5b8d93f2f08b62626c3f3447728c64d198b601ff
2021-01-04 09:09:21 +01:00
Eike Ziller
c650c9473d cmake build: Don't install highlighting files when using system lib
When using the system provided KF5SyntaxHighlighting library,
the highlighting files are taken from the system too.

Fixes: QTCREATORBUG-25143
Change-Id: Iac0b9734bc96e1f72d1494622081da7e279e5554
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-18 16:13:18 +00:00
Eike Ziller
4bc2b4741d Merge remote-tracking branch 'origin/4.14'
Change-Id: I842a7c7358fd0ff6d85c151806e440043914e09a
2020-12-14 14:19:15 +01:00
Eike Ziller
919ffcb0fb cmake build: Add option to build against system SyntaxHighlighting lib
Enable/disable our own KSyntaxHighlighting by default
depending on the availability of KF5SyntaxHighlighting.
If that is available, it still is possible to turn the building
and using of our own KSyntaxHighlighting copy on by enabling
BUILD_LIBRARY_KSYNTAXHIGHLIGHTING.

Fixes: QTCREATORBUG-25076
Change-Id: I3545fc12d87572d7eb6f5977994b081ff7ea3880
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-11 09:37:23 +00:00
Alessandro Portale
a3857a996a Don't access static functions/fields via instance
Courtesy of readability-static-accessed-through-instance

Amends: b2a766a79a

Round #2: This time done with Qt Creator's Analyzer, which
found other occurences than run-clang-tidy.py

Change-Id: I479e280c7abcf2d24baccbb0af69ae4bda05198e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-11-27 13:26:07 +00:00
Christian Stenger
0695738b67 KSyntaxHighlighter: Fix compile with Qt5.14
Change-Id: I9a98717ba99357940ab8b42c025bea4ecfa42102
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-16 08:56:16 +00:00
David Schulz
c2b6d45670 Editor: Qt6 compile fixes for KSyntaxHighlighter
Change-Id: I65487a3ccb93efeec3be3971f876d317b5a6bfc6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-16 08:12:14 +00:00
David Schulz
b49a9c2d8b Editor: update KSyntaxHighlighting to v5.75.0
Change-Id: Ibef1526fccf52920d0d557c8b8f3a52bec5550f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-16 06:40:26 +00:00
Eike Ziller
bf8879ee5c TextEditor: Add missing file to dev package
The public header "textdocumentlayout.h" includes "State" from
KSyntaxHighlighting, so we need to export that.
Since it doesn't have the ".h" extension, it doesn't get exported
automatically either. Add a generic function for adding such special
public header files.

Fixes: QTCREATORBUG-24413
Change-Id: I841e6d601df7e925f48eedcc2a28d6b43c00350e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-29 12:58:52 +00:00
Leena Miettinen
9c0544c386 Doc: List all licenses applied to KSyntaxHighlighting
Added license files.

Fixes: QTCREATORBUG-24618
Change-Id: Ibeeb69f9f072d2c11e0c7a3839bd760986807dd8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-10-27 09:45:50 +00:00
Eike Ziller
4dc9d92b1e Remove unneeded QStringList forward declarations
Fixes build issue with Qt6, for which QStringList is now a
QList<QString>.

Task-number: QTCREATORBUG-24098
Change-Id: I0c81aa5bae413b836dbedea0bb6117b46f6f24c2
Reviewed-by: hjk <hjk@qt.io>
2020-09-29 08:58:12 +00:00
Alessandro Portale
dc1439dedd CMake build system: Propagate less target dependencies and includes
...and thereby have less include paths per compile unit.

Change-Id: I70de8db12d881ea827595ca0cacaea13b5c0f3bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 10:53:12 +00:00
Eike Ziller
552a1296fe Fix crash in KSyntaxHighlighting
In contrast to QString::midRef/QStringRef::mid, QStringView::mid
crashes/asserts when being passed values that exceed the string length.

Amends 6b9cad8b05

Task-number: QTCREATORBUG-24098
Change-Id: Icc53a5dc3bcbc881e614140d4084bdea2bfab59d
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-09 06:23:07 +00:00
Christian Stenger
ae7aa56733 KSyntaxHighlighter: Fix compile
Amends 6b9cad8b05.

Change-Id: I9f254e254edfadeb4fa1e41c20514463477d7184
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-08 09:40:22 +00:00
Eike Ziller
6b9cad8b05 KSyntaxHighlighting: Use QStringView instead of QStringRef
QStringRef will be removed for Qt6, or moved into a Qt 5 compatibility
library, but the QString API will be removed.
Switch to QStringView instead.

Task-number: QTCREATORBUG-24098
Change-Id: Ia3cab3de24ba36b5db64e1eff18d92e66ccd3d94
Reviewed-by: hjk <hjk@qt.io>
2020-09-08 07:10:39 +00:00
Eike Ziller
5de5686179 KSyntaxHighlighter: Replace usage of deprecated enum value
QNetworkRequest::FollowRedirectsAttribute is removed in Qt6,
use the semantic equivalent.

Task-number: QTCREATORBUG-24098
Change-Id: I73822f87bd8b6464e9b5d0ba871fec322cbdd8b9
Reviewed-by: hjk <hjk@qt.io>
2020-09-08 07:10:24 +00:00
Eike Ziller
2a05186194 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	CMakeLists.txt

Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
David Schulz
0c2909a24e Editor: update autogenerated KSyntaxHighlighting sources
Change-Id: I77827db6889335250699f942a4cdaf77a5a95337
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-20 08:56:41 +00:00
hjk
e62044aa29 Use Qt::SkipEmptyParts unconditionally
Squashes a warning in qmldebugtranslationwidget and is safe to use
with Qt 5.14.

Change-Id: I1912e7379a570a17fbf057b87390a63d524ced49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-14 06:41:46 +00:00
Eike Ziller
f296ed1328 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
2020-08-13 11:41:32 +02:00
David Schulz
5cd625babf Editor: update KSyntaxHighlighting lib to 5.73.0
Change-Id: Ic46cf24a6afd5cee28f4294dc67186ae0d24fbf0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-11 08:04:19 +00:00
hjk
6c590531b0 Small Qt 6 migration stuff
- qsizetype vs int
- QJsonValue vs QJsonValueRef
- #include for metatype system

Task-number: QTCREATORBUG-24098
Change-Id: I066d9e3d5c35766b8aa3adc1c5835b23feb20b37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-29 14:03:19 +00:00
hjk
d47bd61e0c 3rdparty/syntax-highlighting: Adapt HtmlHighlighter to Qt6 codec use
Change-Id: Ifb784b02b01f4cfe89879eae7e2866b694f45581
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-15 06:20:57 +00:00
hjk
b9d6a04121 3rdparty/syntax-highlighting
Include QVector headers instead of forward-declaration to make it
usable with Qt 6.

Change-Id: Ic81f4ebd75005452c9b0ec1aa87cfd8b02516d14
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-14 09:09:30 +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
Orgad Shaneh
8542699b89 KSyntaxHighlighter: Sync with original repository
from commit ff67bbbeff62d8b91b83d74c0c27dfee00f39a00.

CMakeLists.txt excluded.

Task-number: QTCREATORBUG-22558
Change-Id: I405e23e63483aa9a7e2daf899a335bd71e1b036e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-30 04:25:35 +00:00
Cristian Adam
0c1db91831 CMake Build: fix for TextEdit MSVC compilation failure
This failure was due to b4868a4560 which
changed KSyntaxHightlighting to be a shared library.

Change-Id: I689fdbc05d39286cb0adbf7502409cde82e28baf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-01-14 18:34:14 +00:00
Cristian Adam
b4868a4560 CMake Build: build KSyntaxHighlighting library as shared library
Matching this way what qmake build of Qt Creator was doing.

Change-Id: I36d8f342365032434d24dd2a061a7ad8aaf826de
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-14 17:36:34 +00:00
David Schulz
5634f112bd SyntaxHighlighting: update KSyntaxHighlighting engine to v5.63.0
Task-number: QTCREATORBUG-22558
Change-Id: I0902d5d866fc83fca2d508cab24dea8d7176240c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 10:11:54 +00:00
Cristian Adam
4a20a596c8 CMake Build: Use shared precompile headers
This will make the build directory size smaller, as only two
pch files will be generated. Not one for every target.

Change-Id: I3eec91e7536eab1c62bff8843f075f0ef7b5fff6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-09-19 11:38:34 +00:00