summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Make PagedSettings::readSettings() calls shorterhjk2023-05-161-3/+1
| | | | | | | | | | Ideally, this would not be needed on the user code side at all, but there's no way to ensure the settings are read timing before sibling constructors might need it. So keep the 'poor man's two-phase initialization', but make it less intrusive. Change-Id: Ica7f6510cd05072d7286f4e85cd72c494e8f10f8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QMakeProject: Use PagedSettings page for optionshjk2023-05-166-115/+58
| | | | | | | Also adapt to a few recent usage changes. Change-Id: I33f45fe7c2b8738280a7c81ddb9110cb8714c45a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Remove ineffective resize() callsAlessandro Portale2023-05-101-1/+0
| | | | | | | | | | | This removes apparently unnecessary resize() calls on QWidgets based forms which get anyways added to layouts and resized. Most of these size values looked "accidental", i.e. neither divisible by 2 nor by 5, in most cases a remnant from the ui inlining. Change-Id: I95da3b93f2915ef955b5235e5c2ecc94b51f813a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Utils: Rename qtcprocess.{cpp,h} -> process.{cpp,h}Jarek Kobus2023-05-048-8/+8
| | | | | | | | Follows QtcProcess -> Process rename. Change-Id: I97235a9a40cb7fd52944515b7ab878d96528f919 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Utils: Rename QtcProcess -> ProcessJarek Kobus2023-05-042-8/+8
| | | | | | | | Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Layouting: Make aspects operate on parent items, not LayoutBuilderhjk2023-05-031-2/+2
| | | | | | | LayoutBuilder is meant to be an implementation detail nowadays. Change-Id: I777ab934d3d405873e819eeddd27428d8c652f9a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Layouting: Handle attach types via setterhjk2023-05-031-1/+2
| | | | | | Change-Id: I862f5cd109db3582b4f029787ec0cded2da39ce6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Rename asynctask.{cpp,h} -> async.{cpp,h}Jarek Kobus2023-05-032-2/+2
| | | | | | | Follows AsyncTask -> Async rename. Change-Id: I37f18368ab826c9960a24087b52f6691bb33f225 Reviewed-by: hjk <hjk@qt.io>
* Tasking::Process: Rename Process into ProcessTaskJarek Kobus2023-05-031-2/+2
| | | | | | | | Rename QtcProcessAdapter into ProcessTaskAdapter. Task-number: QTCREATORBUG-29102 Change-Id: I1902c7176da75db60d70125f505084a2ea5ba774 Reviewed-by: hjk <hjk@qt.io>
* Utils: Make Layouting a top level namespacehjk2023-04-253-3/+3
| | | | | | | | | | The whole machinery is now almost only layoutbuilder.{h,cpp}, mostly independent of the rest of Utils. Idea is to finish the separation to make it stand-alone usable also outside creator. Change-Id: I958aa667d17ae26b21209f22412309c5307a579c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Remove one LayoutBuilder::addRow() overloadhjk2023-04-251-3/+3
| | | | | | | | | | The flexibility here is getting in the way later when trying to remove the dependency on aspects. Change-Id: I7221e80f2067292c7c80aead8f6d739fb7878f7e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Avoid creation of temporary lists of ProjectNodeshjk2023-04-173-26/+16
| | | | | Change-Id: Iac84f7f95291fb3b12a071a066d358aaab309c52 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* RunExtensions: Move onResultReady and onFinished into asynctask.hJarek Kobus2023-04-171-1/+0
| | | | | | | Change-Id: I96dbf5b0253251224ae678172cd5fca12b34326a Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* ProjectExplorer: Inline BuildStepInfohjk2023-03-281-1/+1
| | | | | | | Was a more or less arbitrary subset of BuildStepFactory data. Change-Id: Ie37735532da8a15a22d5f92e1b45d6ed5f7758fc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix include styleJarek Kobus2023-03-242-6/+8
| | | | | Change-Id: I64cb77f8d39dac35821fe96d735bc5dda35738e7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmakeProjectManager: Work around a warninghjk2023-03-241-2/+4
| | | | | | | | warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I95b97781934521b578571da196d6688302ce76f6 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmakeProjectManager: Add lib and app binaries to project treeChristian Kandeler2023-03-203-15/+45
| | | | | | | | Task-number: QTCREATORBUG-28815 Change-Id: I4a3bbab54ce4f5cf6553d61f50b047f63b88cfa3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: Proliferate FilePath a bithjk2023-03-151-1/+1
| | | | | Change-Id: Ia671a1de17b9e58764375c5f64cc47b053b0725a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QMakeProject: Use QtConcurrent invocation for async runJarek Kobus2023-03-103-10/+13
| | | | | Change-Id: I9e5027acb71eb03efef0f5f38a57286c37e74983 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: More explicit host os use to make it stand outhjk2023-03-071-2/+2
| | | | | | | | | | Quite a few of the uses are actually wrong, but are better visible now and therefore more likely to be fixed. Change-Id: Ia51f7d6eb1b2d3a9c9f73d67dabacfd227c44b15 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Avoid a few double lookups when expanding environment valueshjk2023-03-031-2/+2
| | | | | | Change-Id: Ie84caee89a48d8006e6324c5a82901d01a5fac6c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QMake: Avoid some explicit use of environment iteratorshjk2023-03-021-3/+3
| | | | | | Task-number: QTCREATORBUG-28357 Change-Id: I80eae26eb1e7c7202654acdd3eb9380934bb7347 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Move some not-fully-session related bitshjk2023-03-013-14/+19
| | | | | | | | | | | | | | | ... out of SessionManager. The idea is to later move SessionManager into the Core plugin, which both is sensible conceptually and also prerequisite to merge the Bookmark plugin into TextEditor plugin. Currently, only the interface is split, as the load/save implemetations are non-mechanical to disentangle. Change-Id: I31631db3094ea192825a2ccaa6add6188662940b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Qt Designer Custom Widget wizard: Generate XML as raw string literalFriedemann Kleint2023-03-011-1/+2
| | | | | | | It makes it easier to customize it later on. Change-Id: Ie4ac7830a5544746d621b5ba34d174b3f8e3676a Reviewed-by: hjk <hjk@qt.io>
* Qt Designer Custom Widget wizard: Remove remains of Qt 4Friedemann Kleint2023-03-011-13/+2
| | | | | | | | Clean the .pro files and use Qt 5 plugin metadata instead of old exports. Change-Id: I24c96d90f5dc45ecd20064159eb175e0e0475a34 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-02-222-5/+6
|\ | | | | | | Change-Id: I8a53e2e8216fab7e45c3a1b8a3d2dc6656dfa7e2
| * Translations: Merge "OpenWith::Editors" into "QtC::Core"Alessandro Portale2023-02-202-5/+6
| | | | | | | | | | | | Change-Id: I241ccc53afa11fa3faa1f1ca9363421827081812 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* | QmakeProjectManager: Remove unused declarationhjk2023-02-211-1/+0
|/ | | | | Change-Id: I187538270bdcb9288d63e7ae73944101552e3485 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Remove unneeded includes of task.h and taskhub.hJarek Kobus2023-02-141-1/+0
| | | | | | | | | And some other includes spotted by the way. Change-Id: Icd5eadf16617506fe48fae52ff0639d247002d75 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Translations: Change translation context prefix from "::" to "QtC::"Alessandro Portale2023-02-102-8/+8
| | | | | | | lupdate would be confused by translation contexts starting with :: Change-Id: Ie95e73436fd3cafc80a8e89f908efadc747e644c Reviewed-by: hjk <hjk@qt.io>
* Translations: Remove stray Q_DECLARE_TR_FUNCTIONS(...)Alessandro Portale2023-02-102-8/+4
| | | | | | | | And handle the consequences in qmakebuildconfiguration.cpp. Change-Id: Ic24d99927254e8d16decea49b880a2446bf322e6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Translations: Add missing "::" prefixes to QT_TRANSLATE_NOOPAlessandro Portale2023-02-081-7/+7
| | | | | | Change-Id: I7589a2d4003394e38e58c095b510f8eff33263b8 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Refactor BuildSystem::extraCompilerForSourceChristian Kandeler2023-01-274-7/+10
| | | | | | | | | | Factor out backend into more generic function to easily support new accessors. No functional changes. Change-Id: I715ce2842d2c63574bdf6ada0d0e32fbfd5d08fb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Designer: Update C++ code model on an object name change in designerChristian Kandeler2023-01-274-0/+23
| | | | | | | | | | We try to locate the old symbol name in the generated ui header and rename the symbol in the background. Task-number: QTCREATORBUG-1179 Change-Id: Iaf68e3922cd728cbc87d0dc97125e34b8bdaa6be Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
* QtSupport: Move Designer and Lingust external editors from qmakehjk2023-01-265-319/+0
| | | | | | | | | To make them accessible also if the QmakePluginManager is not loaded. The translatable strings are kept under "QmakePluginManager" for now. Change-Id: I208ed7d3c8a003c930bd00501c7f64968b64681a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QMake: Simplify ExternalEditor creationhjk2023-01-253-169/+115
| | | | | | | | | | Remove the intermediate inheritance level, clean up the fallout. Plan in move them to QtSupport in a follow-up step. Change-Id: I7fbecc7ea087b5f8e2c4bfbe97c2295957e454a9 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Utils: Flatten LayoutBuilder related hierarchieshjk2023-01-201-1/+1
| | | | | | | | | Originally the idea was to only expose LayoutBuilder, but we are getting more and more related items. Be consequent now, and have everything in Utils::Layouting, but not in nested classes. Change-Id: Ic0f98595882e5c60a25c30ec52df4a0ea79bc0ca Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Use simpler Plugin::initialize() when feasiblehjk2023-01-202-6/+2
| | | | | Change-Id: I567965d266f20526bda9f823e31a04b354d53fb1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Tr::trhjk2023-01-162-7/+5
| | | | | Change-Id: I8f1b463c5cc7a53627f7a9ad261998b92f13e56a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmakeProjectManager: Simplify makefile extraction logic a bithjk2023-01-161-3/+2
| | | | | | Change-Id: I7b28bb1889e243e390c705d66cf460d33299b3d1 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Qmake: Remove ArgumentFlag::OmitProjectPathhjk2023-01-162-3/+0
| | | | | | | | Last user went away with 344a8f5622. Change-Id: I54c6378da553a6ee6b36c8cfc3021e2f390ded50 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Prefix Tr::tr contexts with ::hjk2023-01-133-4/+4
| | | | | | | To make outliers better visible in Linguist Change-Id: Ic35ea2a858b7e3576d9a416fb494fddb616eaaa1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qmake: Use FilePath in QtVersion::reportIssueshjk2023-01-123-13/+10
| | | | | Change-Id: Ia848248525238c316d6f6f120d915b9bdb28b8fe Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CppProjectUpdater: Reuse TaskTreeJarek Kobus2023-01-111-0/+1
| | | | | | Change-Id: I7474e5a31d169bf435d94536cffd77d218320977 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Utils: Rename QtcProcess::readAllStandard* to readAllRawStandard*hjk2023-01-101-2/+2
| | | | | | | | | | | | ... and re-use the old QtcProcess::readAllStandard* names for a QString-returning 'decoded' version. For now, only use that in 'full Utf8' cases, to stay bug-compatible, the plan is, however, to employ the QTextCodecs we have already in the channel buffers. That will be one-by-one, though. Change-Id: Id209e0671920d4ea4197918e872f441254112d52 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Qmake: Enhance remote parsinghjk2023-01-105-60/+72
| | | | | | | | | | | | | | | | | | | | | | | | | When parsing remote .pro files the parsers needs to pretend it runs on the remote device. All internal data are now "local on the remote", so that string manipulation in .pro files "just works", and a 'device root' string is passed around to relevant functions which then use it to construct FilePath::toFSPathString()-style paths that our custom FSEngineImpl can then map to the real device. Remote $$system() calls are intercepted by the local parser and redirected using the usual QtcProcess mechanims. Quite a bit of the ProParser needed adjustments, so there's some potential for regression. Task-number: QTCREATORBUG-28242 Task-number: QTCREATORBUG-28161 Task-number: QTCREATORBUG-28355 Change-Id: I6100e7aca4e1db35f5e9689004110aab57e2c595 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-0668-68/+68
| | | | | | | | | | | | | | | 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>
* QMakeStep: Use TaskTree for running qmake stepJarek Kobus2023-01-052-61/+52
| | | | | | Change-Id: I8737a0fe3f8857db4e171001a73adde842d05d44 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* AbstractProcessStep: Merge finish() with processFinished()Jarek Kobus2023-01-053-15/+11
| | | | | | Change-Id: Ied15ec3ee9d3bcc80b03b2589d101c65f2fd062a Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Qmake: Use FileUtils::commonPath instead of the string based versionhjk2023-01-041-4/+4
| | | | | | Change-Id: Ib7dce9ed26b6ca280767e88ada2bcff52c8a5684 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
View Lorry Controller Status