aboutsummaryrefslogtreecommitdiffstats
path: root/src/share
Commit message (Collapse)AuthorAgeFilesLines
* auto-setup.cmake: Add QT_CREATOR_CONAN_BUILD_POLICY cache variableCristian Adam2021-11-041-1/+11
| | | | | | | | | | 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>
* auto-setup.cmake: warn if conan or vpkg executables are missingCristian Adam2021-09-071-0/+6
| | | | | | | | | | | 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>
* auto-setup.cmake: Better handling of conan edgecasesCristian Adam2021-09-071-111/+129
| | | | | | | | | | | | | | | | | | | | | | 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>
* CMakePM: Add variables to skip Qt Creator's package manager to cacheCristian Adam2021-08-201-0/+4
| | | | | | | | | | | | | | 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>
* Fix executable path for QML utilityKai Köhne2021-08-191-1/+1
| | | | | | | | Amends 453f4996db44c80c8dfd Fixes: QTCREATORBUG-26137 Change-Id: Ic5c1688e8a11cffa10504026b303fb1e30a34fc4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Reference more CMake variables in auto-setupCristian Adam2021-08-051-1/+5
| | | | | | | | | | This will remove the warnings for examples that setup only the C++ compiler, or when configuring QML debugging. Amends 1bf9900aedc3f47355ed88e2edf2b67b6562ce5a Change-Id: Ica9361114be420b81f611f5d498d87949399e8b4 Reviewed-by: hjk <hjk@qt.io>
* CMakePM: Remove QT_QMAKE_EXECUTABLE warningCristian Adam2021-08-021-0/+5
| | | | | | | | By referencing it in the auto-setup.cmake script. Fixes: QTCREATORBUG-26072 Change-Id: I8b2d06f08da96cfa498f818db4c2428702756516 Reviewed-by: hjk <hjk@qt.io>
* use "qml" as QML runtimeTim Jenssen2021-07-133-8/+7
| | | | | | | | | | | | | 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>
* CMakePM: Fix conan compiler path setupCristian Adam2021-05-281-0/+2
| | | | | | | | | 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>
* CMakePM: Setup conan path from Qt SDKCristian Adam2021-04-221-0/+24
| | | | | | | | | 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>
* qmake build system: Install share/3rdparty/package-managerAlessandro Portale2021-02-231-1/+2
| | | | | | | Amends: cc0fa86ffd6c202aeb7ee091bbf8a91d7623718c Change-Id: I00ca24fa18a10ff9bbbdeb86262c24c32d8dd8f8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMakeProjectManager: Add package manager auto-setupCristian Adam2021-02-193-3/+800
| | | | | | | | | | | | | | | | | | | | | | | 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>
* ProjectExplorer: Clean up variablesChristian Kandeler2020-10-024-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* CMake build: Fix copying of external toolsEike Ziller2020-08-191-6/+13
| | | | | | Fixes: QTCREATORBUG-24509 Change-Id: Ic19adf009bba326a2b9e59fe561e4021bbf21412 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake: copy clang and resource files only if necessaryAlexis Murzeau2020-05-111-7/+3
| | | | | | | | | | | | | | | 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>
* CMake build: Copy fonts and syntax-highlighting files to builddirCristian Adam2019-06-131-0/+9
| | | | | | Fixes: QTCREATORBUG-22472 Change-Id: Ib812690c70efdc0ad7b125f6ce9623ca500d698d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Qt Creator CMake portCristian Adam2019-05-174-0/+20
| | | | | | | | | | | | | | 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>
* Add Welcome Page of Qt Design StudioThomas Hartmann2019-03-066-0/+61
| | | | | | Change-Id: I492d27aa5f899630863eb902bf0acc9d9610b80e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* TextEditor: replace generic highlighter with ksyntaxhighlightingDavid Schulz2019-01-2819-14733/+0
| | | | | | Fixes: QTCREATORBUG-21029 Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2018-11-199-323/+1193
|\ | | | | | | | | | | | | Conflicts: src/plugins/winrt/winrtdevicefactory.cpp Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
| * GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2018-11-129-323/+1193
| | | | | | | | | | Change-Id: I0ec59359c7f8670a048dfc35264d6ab64bc62ceb Reviewed-by: David Schulz <david.schulz@qt.io>
* | Use build environment for lrelease and lupdate external toolsEike Ziller2018-09-262-2/+2
|/ | | | | | | Task-number: QTCREATORBUG-19892 Change-Id: Ic3316d51d7d5017aa413d6c910d3784a14237e9f Fixes: QTCREATORBUG-18394 Reviewed-by: hjk <hjk@qt.io>
* Revert "TextEditor: Ship generic Kate highlight definition for Python"Eike Ziller2018-09-111-686/+0
| | | | | | | | | | We ship the PythonEditor which does its own highlighting, so this is not needed for editing python. Users can still download it, but don't ship it with Qt Creator. This reverts commit e3d65fcf3f87806031f647da0da71675e1bc404f. Change-Id: I6c3650419f5ecd191c11dd2abb1bf30e16e4fc29 Reviewed-by: David Schulz <david.schulz@qt.io>
* TextEditor: Ship generic Kate highlight definition for PythonAlessandro Portale2018-08-201-0/+686
| | | | | | | | | | | | Qt Creator comes with several Kate highlighter definition files. With the release of Qt for Python and, soon, the possibility for Python code completion via lsp, it seems appropriate to support Python syntax highlighting by default. Change-Id: If42c620d802920b54c508780b0d264343401b9a7 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Fix running lrelease and lupdate as external toolsEike Ziller2018-07-102-0/+2
| | | | | | | | | | | With newer Qt versions. These want to run cl.exe on Windows, which usually is not on the PATH except for the build environment. So, use the current build environment's PATH if that is available (falling back to the system environment's PATH). Task-number: QTCREATORBUG-19892 Change-Id: Ia512b3599d2cca7a0d1169b0d673f32158cb701f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2018-07-025-846/+3343
| | | | | | Change-Id: I81891762ceb44c7329a75e6d982532419102a232 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2018-02-122-2/+2
| | | | | | | | | ini.xml was also changed, but I disagree with this change (which removed ; and # as comments in ini files), so I left it untouched. Change-Id: I203b0d9382ed404623ea8ba6545970230f0e50ca Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2018-01-027-44/+14
| | | | | Change-Id: Iaabf7ca4b29c44b4c4c4defd476629c91e14ffcc Reviewed-by: David Schulz <david.schulz@qt.io>
* Remove external tool for "sort text"Eike Ziller2017-11-032-39/+0
| | | | | | | We now have Edit > Advanced > Sort selected lines Change-Id: I948718a1be432e00b2646b29f173894a51691164 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2017-07-2610-6553/+6499
| | | | | | | Mostly whitespace cleanup. Change-Id: Ife5831b23d5ee7406ece839f2c1061c9364ac4ad Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2017-06-205-159/+114
| | | | | Change-Id: Id2a6daabef6dae29e83df99ed195f7356f26866c Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Remove invalid entries in makefile.xmlOrgad Shaneh2017-05-191-4/+0
| | | | | | | | | Those keywords are mapped to undefined lists. Reported in https://phabricator.kde.org/D3621#inline-17949 Change-Id: I5d5fc654afe2e35577175a0e3fa2196555ee4ada Reviewed-by: David Schulz <david.schulz@qt.io>
* Add the JSON syntax highlighting fileThiago Macieira2017-02-281-0/+104
| | | | | | | | | Like XML (which is already present), it's very useful. Source: https://cgit.kde.org/syntax-highlighting.git/plain/data/syntax/json.xml Change-Id: Idd5ceba1eba34cb78c46fffd14a738f347db0d19 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2017-01-177-23/+309
| | | | | | Change-Id: I2fdf7f48494e2de3ef8ec64260c4f194ab5f959d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Update from latest KTextEditor sourceOrgad Shaneh2016-10-2116-927/+1134
| | | | | Change-Id: I0caf19cd7698c9934655483304314b5653b69f21 Reviewed-by: David Schulz <david.schulz@qt.io>
* 3rdparty: Update Source Code Pro fontAlessandro Portale2016-10-183-0/+0
| | | | | | | Roman fonts version 2.030 and Italic fonts version 1.050 Change-Id: Ib5142f373531b3ad20f7b497b708b8f458275a7b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* GenericHighlighter: Update from latest KTextEditor sourceOrgad Shaneh2016-07-222-15/+15
| | | | | | Change-Id: Ic0ede8fce1c1cd1296bdf74f3e8591f138f234ea Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Adding Source Code Pro font and loading it on startupThomas Hartmann2016-07-185-1/+95
| | | | | | | | | | | This makes Source Code Pro available on all platforms. This font is designed specifically for code editing designed by Paul Hunt. See: https://github.com/adobe-fonts/source-code-pro Change-Id: I7c5a875bd5fc09b02049706f1d61f3667c10d967 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Ask before reloading file changed with external editorRobert Loehning2016-06-303-3/+3
| | | | | | | To be consistent with other ways of starting external editors. Change-Id: Ia6f8d2179076482999ef527353feb91a49e1a2d9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Move 3rdparty resources into 3rdparty subdirectoryEike Ziller2016-04-1218-0/+10917
| | | | | | Change-Id: Ib6363629ef3e4d10bca64936a46147b5defc048b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove code duplication for copying resources.Eike Ziller2016-04-122-2/+22
| | | | | | | | | | | | | qtcreatordata.pri was created for "conditional" copying of resources to the build tree. Adapt it a bit and use it for the "unconditionally" copied resources as well. A side effect is, that the unconditionally copied resources now are also installed file by file instead of the directory as a whole, which doesn't make a difference in the end result though. Change-Id: I6da3eeaadcb48c19987858bbb8c2d42ee149f6f3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-198-136/+104
| | | | | | | * Update files in src/share* and src/tools Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-128-48/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-168-48/+48
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Make sure qmlviewer/qmlscene application output is printedKai Koehne2015-02-022-0/+2
|/ | | | | | | | | | | | | | Qmlscene and qmlviewer are GUI applications. The heuristic to detect where to print application output (windows log or stderr) has changed in Qt 5.4, which caused the qmlscene, qmlviewer external tools to not print output anymore into General Messages. Work around this by forcing the tools to always print to stderr. Task-number: QTCREATORBUG-13753 Change-Id: Iceee600dd402032674fd3ee11e0bd920793659d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* License updateEike Ziller2014-10-098-56/+64
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-088-8/+8
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-318-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-298-8/+8
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-182-1/+44
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/gdboptionspage.cpp src/plugins/fakevim/fakevimoptions.ui src/share/share.qbs Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 20:12:31 +0000