aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
Commit message (Collapse)AuthorAgeFilesLines
* Update Qbs to HEAD of masterEike Ziller2020-10-201-0/+0
| | | | | | | Fixes issues when compiling with ccache. Change-Id: I3cb712b84f527eaf35649d207d5750fa698d46b7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* QmakeProjectManager: Make "system" execution opt-inChristian Kandeler2020-10-162-2/+7
| | | | | | | | | | It has too many side effects. Amends fcd6384f4d. T_SYSTEM and E_SYSTEM are now treated the same. Fixes: QTCREATORBUG-24551 Change-Id: Ib6df2762d329f2ddc0dd66190454159d446a9ac9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake build: Build Qbs if the submodule is availableEike Ziller2020-10-092-0/+34
| | | | | | | | | | Includes update of Qbs to current head of master, which enables this feature on the Qbs build system side. Fixes: QTCREATORBUG-23905 Change-Id: I9a537b640b7f7a753839ace3e44d174c8e0af526 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-10-021-2/+12
|\ | | | | | | Change-Id: I3f2a6c553819e992da7e9f538dc44b95b482359e
| * ProParser: Fix crash when starting a QProcessChristian Kandeler2020-09-281-2/+12
| | | | | | | | | | | | | | | | | | | | | | QProcess modifies the internals of its QProcessEnvironment object in a manner that is not thread-safe. We therefore force a detach, so each QProcess instance gets its own QProcessEnvironment. Fixes: QTCREATORBUG-23504 Change-Id: I7fc1fda5e7bc11ac4e9a59596a5bdb0ac420a315 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Help: Fix build of shared_helpEike Ziller2020-09-301-0/+5
| | | | | | | | | | | | | | The define is correctly set in src/plugins/help, but missing here. Change-Id: I211554c195d1198bbed040c40cb2c707b623364d Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Fix PCH file for Qt6Eike Ziller2020-09-291-1/+2
| | | | | | | | | | Change-Id: I273af019758d56bca159e517a45b68f8d3a16f5e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Cleanup ProString::append/prependLars Knoll2020-09-232-55/+38
| | | | | | | | | | | | | | | | | | | | Don't use evil hacks that make assumptions about QString internals. (Cherry-picked from qtbase/c4dbd1c) Change-Id: Ibc7ab78cba29a8a0ad458087def4aea2ed2786e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | ProParser: Fix compile of manual testChristian Stenger2020-09-152-2/+2
| | | | | | | | | | | | | | Amends 58d288b52. Change-Id: I5c142b0ce30f7145db6a8d332c8f0617e2c99fe5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Proparser/QtSupport: Fix build with Qt6Eike Ziller2020-09-1412-134/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in some QStringView related updates to proparser: f5d8ad61a4c85a656a7332c43d0c42f5eaf43593 "qmake: use new QString::arg(QStringView) overload" 52f3a7d9d40d3bf835bb0716ad201ee56731b980 "Build qmake with QT_USE_STRINGBUILDER" c49728eb27be0f3f2eaaa77b0ed573f5d8705af1 "Port qmake from QStringRef to QStringView" But do it in a way compatible with Qt5. Since some QStringView API is not available in Qt5 (see QTBUG-86516), this means using a StringView typedef that is either QStringRef (Qt5) or QStringView (Qt6) Task-number: QTCREATORBUG-24098 Change-Id: Ic9a73ca450543f3fdd5fcf9d686c4b773a48854c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-311-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/clangtools/virtualfilesystemoverlay.h src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui src/plugins/qmldesigner/designercore/model/abstractview.cpp Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
| * qmake: Prevent injection of empty values via environment variablesChristian Kandeler2020-08-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmake $() operator retrieves environment values at make time. In Qt Creator, we still use these values for feeding the code model, presumably because the qmake and make step share a common environment. However, we must take care that unset environment values do not lead to empty strings in qmake lists, as that can have unwanted side effects, especially when these lists get turned into command line arguments that are passed to build tools. A concrete example: A project file contained the following assignment: QMAKE_CXXFLAGS += $(SOME_VAR) SOME_VAR was not set in the environment, so an additional empty argument appeared on the command line when the code model called the MSVC compiler to retrieve some information required for parsing the code. The call failed, the code model had to fall back to default values, and the user got parsing errors. Fixes: QTCREATORBUG-21729 Change-Id: I224369a2fb9c0dd78406253edba03bd44556be44 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Help: Replace Qt::MidButton by Qt::MiddleButtonhjk2020-08-283-3/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I46e06ec1402be345ebd1e4543ed67a726caa42a7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-251-0/+0
|\| | | | | | | Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
| * Update qbs submoduleIvan Komissarov2020-08-241-0/+0
| | | | | | | | | | | | | | To the head of 1.17 branch Change-Id: I4254418c746303c8a340a93f42128f34d4fa69b9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang: Fix include/resource dir confusionChristian Kandeler2020-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-211-0/+0
|\| | | | | | | | | | | | | Conflicts: CMakeLists.txt Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
| * Update Qbs submoduleIvan Komissarov2020-08-201-0/+0
| | | | | | | | | | Change-Id: I6f6de1f368cfc6cb94d9503ab9554efc19ae0c97 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-141-0/+0
|\| | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: Ibb60b8a7ac531b239bb9c490da843d5cc1a6300a
| * Update Qbs submodule to head of 1.17 branchIvan Komissarov2020-08-141-0/+0
| | | | | | | | | | | | Change-Id: I92f5f8af60487c9aa71022dad26d348ceef1b181 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-101-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/cmakeprojectmanager/cmakebuildstep.h tests/auto/debugger/tst_namedemangler.cpp tests/auto/qml/codemodel/check/tst_check.cpp Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
| * Update qbs submoduleRichard Weickelt2020-08-061-0/+0
| | | | | | | | | | | | | | To HEAD of 1.17 branch. Change-Id: If128125a5e6a24efe7cdd523e133634e2bfe72d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Update qbs submoduleRichard Weickelt2020-07-241-0/+0
| | | | | | | | | | | | | | To HEAD of 1.17 branch. Change-Id: Ic9015ebc7bb77b2ae6d9a10fd93d1e4a5279ff1d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Update qbs submoduleRichard Weickelt2020-07-101-0/+0
| | | | | | | | | | | | | | To HEAD of 1.17 branch. Change-Id: I9cb01480d72d3d6132c80449ac2da5e18dc6c7f4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProParser: Replace QRegExp by QRegularExpressionChristian Stenger2020-07-223-6/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I8613286f27987034d6c8924fd7103e3c3ddd4e85 Reviewed-by: hjk <hjk@qt.io>
* | PCH: Replace QRegExp by QRegularExpressionChristian Stenger2020-07-201-1/+1
| | | | | | | | | | Change-Id: I2b0e88acae26ab71ba72cab862f021882e56ba19 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Shared: Replace QRegExp by QRegularExpressionChristian Stenger2020-07-202-7/+9
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: If61fc5ac5ef6e9d807df94b9e85ef98a549050a3 Reviewed-by: hjk <hjk@qt.io>
* | Qmake: Drop use of QTextCodec in pro parserhjk2020-07-112-30/+1
|/ | | | | | | This follows 42d2d70ab in qtbase. Change-Id: I519a20421ce452984fa21ec0f988379bed9368d0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Fix handling of paths inside common pri fileChristian Stenger2020-07-091-2/+4
| | | | | | | | | | contains() expects a regular expression as value, so using a bare windows path may be a bad idea. Beside this fix the LLVM_INCLUDEPATH which is reported wrong already by llvm-config. Change-Id: I95aa3e461541099aac6607c4a8db8a38f9b2b0f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Help: Fix clang warning about unneeded copyChristian Kandeler2020-06-261-1/+1
| | | | | Change-Id: I0526245773be1dcc71f7ed28e9c5113f20b66df6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* ProParser: Adapt to QRegExp removalhjk2020-06-243-30/+57
| | | | | | | | | That's part of a1947aeffe1 in qtbase, with manual adaptation. It looks like we've been out-of-sync with upstream already before. Change-Id: Ie6ef9e4fce44e01944194dc27bd3f54274ad7c6f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* ProParser: Fix build with MSVCChristian Kandeler2020-06-231-0/+9
| | | | | | | Strangely, MSVC requires operator< for values of std::list. Change-Id: I5f62348a69d9b25585798b7824c6538d4cb5df7c Reviewed-by: hjk <hjk@qt.io>
* ProParser: Drop use of QLinkedListhjk2020-06-233-26/+29
| | | | | | | | Effectively 7cba2acd2cc and 0d88721d772 from qtbase. Task-number: QTCREATORBUG-24098 Change-Id: I88902b358d88e34032f588b9eb0af13c5b9d8675 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove uses QOverload<const QString &>::of(&QComboBox::currentIndexChanged)hjk2020-06-192-7/+4
| | | | | | | | Gone in Qt 6. Task-number: QTCREATORBUG-24098 Change-Id: I7ab2dcb9b7c71a3b0d07f05162ef2752e02dc881 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submoduleChristian Kandeler2020-06-171-0/+0
| | | | | | | | To HEAD of master branch. This fixes a number of Qt 5.15 warnings. Change-Id: I1e10134268ea3687d6ad979ae263fc91dc804d50 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Disable ClangRefactoring by defaultEike Ziller2020-06-021-2/+2
| | | | | | | | | | It is too unstable even for experimental status. Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProWriter: Do not insert a backslash when adding new filesChristian Kandeler2020-06-021-1/+2
| | | | | | | | ... if the previous line already has a trailing backslash. Fixes: QTCREATORBUG-24083 Change-Id: Ieabce541da2ef55bcbf3bd14d139b14f3a7575c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake build: Avoid using extend_qtc_target directlyEike Ziller2020-05-181-1/+1
| | | | | | | Also add a extend_qtc_test which checks if the test is known. Change-Id: Idd3b3a02ac61fce2622cb8681233cfbd96a77bc4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* qbs: update to the master branch and fix .pro files accordinglyIvan Komissarov2020-05-112-1/+4
| | | | | | Change-Id: I22a28c9d359340ba1fada04ec4eee525df8ecfca Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qmake: Run the test version of system()Christian Kandeler2020-04-301-4/+0
| | | | | | | | | | | ... also when PROEVALUATOR_FULL is not defined. For more correct parsing. We do not believe that this introduces additional risk, because the replace version of system() has always been enabled, and appears to be used more often. Fixes: QTCREATORBUG-23940 Change-Id: I036a20fdab3f6c51c612912b60686a123440f397 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-282-4/+7
|\ | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
| * CMake build: export less generic public includesEike Ziller2020-04-242-4/+7
| | | | | | | | | | | | | | | | | | Do not put every plugin's and lib's source folder into public includes. We require includes of the style <somelib/foo.h> and <someplugin/bar.h> if someone depends on somelib or someplugin. Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-171-0/+0
|\| | | | | | | Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
| * Update qbs submodule to HEAD of the 1.16 branchRichard Weickelt2020-04-161-0/+0
| | | | | | | | | | Change-Id: I8891681d62c107ec7e8dcf44c50f8d4e2dc4a87f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-141-0/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
| * Update qbs submodule to HEAD of the 1.16 branchRichard Weickelt2020-04-071-0/+0
| | | | | | | | | | Change-Id: I6a616a9f2e28deab53911c0f68baf062a94e0467 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix deprecation warning when using linksForKeyword()Jarek Kobus2020-04-031-2/+15
| | | | | | | | | | Change-Id: I6c8beeabb82f0a50def944ee893753a229c41908 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-031-2/+7
|\| | | | | | | Change-Id: I79083060dfc3bc4408123acd3b7305b9701650fd
| * ProWriter: Fix removeVarValues() functionChristian Kandeler2020-04-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | This function wrongly assumed that there is always an empty line between variable assignments. For instance, When renaming a header file in a project file where HEADERS follows right after SOURCES, the function would erroneously claim that it removed the header file from the SOURCES segment, so follow-up code added the name name there instead of to HEADERS. Fixes: QTCREATORBUG-23720 Change-Id: I55288b22fe16fa0593b277d8808ab5d64ba90549 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Integrate new filter engineJarek Kobus2020-04-024-5/+5
| | | | | | | | | | | | | | | | Adapt the code to deprecated usage of map as a multi map, hence all cases replaced by QMultiMap. Change-Id: I2d480467cd6e91d3e880555e6a21058dec056b3f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:51:54 +0000