summaryrefslogtreecommitdiff
path: root/src/libs/utils/stringutils.cpp
Commit message (Collapse)AuthorAgeFilesLines
* StringUtils: Fix missing includeJarek Kobus2023-04-191-0/+1
| | | | | | | Amends a353e9fde19ae0862ed95aeb71654da57f24fcac Change-Id: Iee878da1f907ec0131dd3fd16fe4f84752355b38 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Markdown: Reuse Markdown highlighter from change log viewerEike Ziller2023-04-191-3/+60
| | | | | | Change-Id: Ief1b0c135a34bfd5e9b5220e9fbf93f281d8e95a Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Copilot: Add insert next word actionMarcus Tillmanns2023-04-061-0/+22
| | | | | | Fixes: QTCREATORBUG-28959 Change-Id: Ied53ad5676133e2eb71988ecfcce90c5ad77e3c3 Reviewed-by: David Schulz <david.schulz@qt.io>
* Utils: Add stringutils splitAtFirstMarcus Tillmanns2023-03-131-0/+19
| | | | | Change-Id: I221d6c6086f53ec5f94c1157ea533d862db38d52 Reviewed-by: hjk <hjk@qt.io>
* Utils: Fix build of sdktoolChristian Stenger2023-02-071-1/+1
| | | | | | | Amends d829d9ff336629648971b47190a8d2a5840e5d03. Change-Id: Ib2c7543f04444b30c389346eb910861957e19b8d Reviewed-by: hjk <hjk@qt.io>
* StringUtils: Add trimFront(), trimBack() and trim() methodsJarek Kobus2023-02-051-0/+50
| | | | | | Change-Id: I900c30111c79bee548c4861b082d7b035a5dc43d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* StringUtils: Add joinStrings methodJarek Kobus2023-02-031-0/+13
| | | | | | | See QTBUG-110900. In meantime, StringUtils addition. Change-Id: I700321a65d2d00b85daa412c77b573457312ad3c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Utils: Tr::trAlessandro Portale2023-02-011-2/+2
| | | | | | Change-Id: Ic03e20993f05fb5b49a12c891d86afb2c8e18e08 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Utils: Move QtcProcess::normalizeNewlines() into StringUtilsJarek Kobus2023-02-011-0/+11
| | | | | | | Change-Id: I515d2554497d5c27fd75e50c80ba373fbbe8dcb5 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>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | 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>
* Utils: Make Utils::withTildeHomePath a FilePath memberhjk2023-01-051-19/+0
| | | | | | | | Gets .osType() right in remote cases. Change-Id: I6397996062d976d7db690c5729dd4faa1f459563 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Drop commonPath(QStringList)hjk2023-01-041-20/+0
| | | | | | | | | There's FileUtils::commonPath(FilePaths) nowadays. Change-Id: I26e30d61eb80cb457458791e9ad049356f18de98 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Utils: Remove FilePath::operator+()hjk2022-11-301-0/+10
| | | | | | | | | This was a alias for .stringAppended(), but can be used too easily when .pathAppended() is meant. Change-Id: Ia3b64d39828d4074b43d87c923ce3a6a87038948 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | 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>
* FilePath: Fix UNC root/path parsingMarcus Tillmanns2022-08-111-0/+8
| | | | | | | | | * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* filesystem: Add QFSEngine for filepathsMarcus Tillmanns2022-07-211-2/+12
| | | | | Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
* Utils: Add a convenience function to fill clipboard and selectionhjk2022-06-201-0/+17
| | | | | | | | Relieves the user code side from repeated code which then tends to get forgotten. Change-Id: I079f97a658b55f3c79111df1946b8d72863ce513 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Drop unused headers [I-Z]Jarek Kobus2022-05-251-3/+2
| | | | | | | | | Round 2 - focus on sources. For classes with initial in range [I-Z]. Try to keep the same separators between different kind of headers. Change-Id: I8a7ab99bab8120ee72cda6433ee3dc6f260a4d76 Reviewed-by: hjk <hjk@qt.io>
* Utils: More forward declarations / drop unused headers [S]Jarek Kobus2022-05-251-1/+1
| | | | | | | | | | | | Round 1 - focus on headers. For classes with initial in range [S]. Try to keep the same separators between different kind of headers. SmallString[xxx] classes skipped for now. Change-Id: Ie5c8edcb028e33eb8f9619e646afc462b91dca73 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Remove outdated codeRobert Löhning2022-03-091-7/+0
| | | | | | | Change-Id: I65e0ed79dabd987bc67d4082969835d52dd7cb8b 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>
* Multilanguage: Add utility to get language names consistentlyTuomo Pelkonen2022-01-121-0/+13
| | | | | | | | | | | | | There are multiple places that language codes are converted to language names each doing it a different way. To make this consistent, we need to have a single implementation for it. Change-Id: I2aeaf5b7c9203e8a41a61420f4c98e1fce491db5 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix compilation of sdktool against old Qt versionsEike Ziller2020-10-201-0/+7
| | | | | | | Amends 6c5eaed92ca838e68745c71ee27adb754a496b8e Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Fix matching wildcards to full pathsChristian Stenger2020-10-191-0/+64
| | | | | | Fixes: QTCREATORBUG-24792 Change-Id: I82b4edea6260b07e1bdff065b157a4cd044ec629 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Replace foreach with range-based forOrgad Shaneh2020-06-161-1/+1
| | | | | Change-Id: I9aeea9c029ffc56cbadc04edd20e9b35b154f986 Reviewed-by: hjk <hjk@qt.io>
* Deduplicate elapsed time formattingAndre Hartmann2020-02-291-0/+10
| | | | | | | | While it's nice to see my code spreading, I still prefer to have it at one place. Change-Id: I7bdb13c47ed7e96227deeb14b0a8070aa40148de Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Macro expander: Allow alternative substitution characterChristian Kandeler2019-07-101-3/+5
| | | | | | | | | | | The forward slash is a poor choice on Windows for fields containing file paths, as it gets auto-converted to a backslash when used in a path chooser. Fixes: QTCREATORBUG-22276 Change-Id: I1d22d2031909b24c72aad4781995418efd394039 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix C++ Library wizard when compiled with Qt < 5.12Eike Ziller2019-06-031-1/+1
| | | | | | | | | | | | Only Qt 5.12 got true ECMA Script capabilities, so arrow function expressions are not supported before that. To be able to use "regular" inline functions, we allow usage of } by escaping with backslash. For variables that do not start with "JS:" we already supported backslash for escaping. Fixes: QTCREATORBUG-22336 Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix that menus didn't show ampersands in files namesEike Ziller2018-03-261-0/+6
| | | | | | | | | | And instead interpreted the ampersand + following character as an accelerator key. Task-number: QTCREATORBUG-17817 Change-Id: I327239499ce56e75fd12f2df5be60d4b04913acd Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Utils: Introduce case friendly comparison function to stringutilsTobias Hunger2018-03-131-0/+8
| | | | | | | | | | Use this operator in the miniprojecttargetselector as well as the projectconfigurationmodel. This should unify the sorting of build-/deploy- and runconfigurations in various places in Creator. Task-number: QTCREATORBUG-20023 Change-Id: I7aed2ebcb9d65244395d68b7dc5da599d6503962 Reviewed-by: hjk <hjk@qt.io>
* Implement port gatherer on macOSFilipe Azevedo2017-08-301-0/+31
| | | | | | | Change-Id: I054612716872cdb90f2a3fb5d31c20e19962ebaf Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Fix parsing ports from netstat output on Windowshjk2017-08-241-0/+67
| | | | | | | Handle IPv6, and do not try to interpret the result as hex. Change-Id: I700c233d03cc706bc8712ab9fabee75d7f126df3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Unit tests: Fix ProjectInfoGenerator.* testsNikolai Kosjar2017-07-271-0/+23
| | | | | | | | | | ...by adapting to recent mime type changes: commit e8e46ab553bce9aac9adcaf2ac4ee1207b69ac93 Plugins: Fix that mimetype definition was not valid JSON Change-Id: Iac416ab481814e4488fac4d818c51c647c1ec349 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Introduce and use Utils::stripAcceleratorOrgad Shaneh2017-07-071-0/+8
| | | | | Change-Id: I8c37728ca5de20e2b68e6d0ac7fc120baa696040 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* MacroExpander: Prevent loop with subprovidersTobias Hunger2017-06-201-1/+3
| | | | | | | | Prevent a loop where a subprovider of a macroexpander creates the macroexpander itself. Change-Id: Id2f3e29651aeb22c818091d8c785a6ea01545463 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Prepare for upcoming compile breakagev4.2.2hjk2017-03-221-1/+1
| | | | | | | | | | | | Qt 5.9 is going to break source compatibility by making the QStringRef(QString *) constructor explicit. Since the use of that constructor rather looks unintentional here, replace its use. Change-Id: I6f5f2e79f7d92f6e80a1ea0aa12126d9c88b499e Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Support default value substitution in macro expansionOrgad Shaneh2016-07-181-0/+9
| | | | | | | | | | Syntax is similar to bash substitution: %{variable:-default} Change-Id: I50e4e18a186c5408dc8b7b95cebbf891d13e03bf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: hjk <hjk@qt.io>
* Utils: Support pattern substitution in macro expansionOrgad Shaneh2016-07-151-2/+43
| | | | | | | | | | | | | | | Syntax is similar to bash substitution: %{variable/pattern/replacement} takes the expansion of variable, and replaces the regular expression pattern with replacement once. %{variable//pattern/replacement} replaces all occurrences. Capture groups are supported for both forms. Change-Id: I67ff91e2dad4dd8be81573ea446cd1093a05ccf6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: hjk <hjk@qt.io>
* Utils: Remove QLatin1{Char|String} in string utilsOrgad Shaneh2016-07-111-11/+11
| | | | | | | | | Not needed anymore. Easier to read without it. Change-Id: I08c10e9da9b105cecc66bad876dd5e8862f821fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Utils: Fix bug in commonPath() with directoriesDaniel Teske2014-12-101-1/+8
| | | | | | | | | | The algorithm expected a list of filenames, but the cmake plugin passed in a list containing a directory and a filename. Appending a slash to each entry. (Except root entries.) fixes this. Task-number: QTCREATORBUG-13606 Change-Id: I518a2601295017636f4c450cc8a9026f4b41689a Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | AbstractMacroExpander: expand macros recursivelyOswald Buddenhagen2014-09-151-12/+37
| | | | | | | | | | | | Started-by: Tobias Hunger <tobias.hunger@digia.com> Change-Id: Id2e88efbb475221cd7c0347f7d5e7009e4372eec Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | AbstractMacroExpander: Allow escaping of %{Macros}Tobias Hunger2014-09-121-0/+5
| | | | | | | | | | | | | | | | Use "%{}" to put a literal "%" into the output of the macro expander. E.g. "%{}{Macro}" will be turned into "%{Macro}" Change-Id: I592789e5cd8f2d52df424db679baf7ba04723202 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Utils: Merge Abstract{Qtc,}MacroExpander classeshjk2014-06-251-1/+1
|/ | | | | Change-Id: Id78fb47a9b8059684b8b4fc77d9aaaaf23b11bae Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Clean headers in Utils.Friedemann Kleint2013-03-191-3/+0
| | | | | | | | | | Forward-declare QGraphicsOpacityEffect in DetailsButton, QProcessEnvironment in Environment, QFileInfo in fileutils, QUrl in IWelcomePage, FancyLineEdit in PathChooser and remove unneeded headers. Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
View Lorry Controller Status