summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move uses of ProjectMacroExpander closer to build configurationhjk2014-10-221-14/+30
| | | | | | | All static functions, can live closer to related code. Change-Id: I54c5680256c78f1d09b4bee3e8843b2f4350b75a Reviewed-by: Tobias Hunger <tobias.hunger@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>
* | BuildConfiguration: Introduce signal buildTypeChanged()BogDan Vatra2014-07-211-0/+5
|/ | | | | | | | Needed by android plugin. Change-Id: I46543d4889e0e740697439e18e9c1ea0d3fef222 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* CMakeProject: Make CMakeLists.txt and *.cmake use different mime typesDaniel Teske2014-07-171-1/+1
| | | | | | | | Since we want to treat them differently. Task-number: QTCREATORBUG-12461 Change-Id: Ia72b8045390ceec693fa416f65010a4c4dbecce1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Project: Use Utils::FileName as return type for projectDirectory(...)Tobias Hunger2014-05-061-2/+2
| | | | | Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Project: Use Utils::FileName as return type for projectFilePath()Tobias Hunger2014-05-061-2/+2
| | | | | Change-Id: If304d5e95cd9ac714100abaae35d60e3e1050eb2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* CMakeOpenProjectWizard: Set a parentDaniel Teske2014-03-261-1/+1
| | | | | | Task-number: QTCREATORBUG-11856 Change-Id: Ie80352683e2a8276f70191db2a3b333275e2648f Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* CMakeBuildConfiguration: Fix cloning buildconfigurations resetting ninjaDaniel Teske2014-03-111-1/+1
| | | | | | Task-number: QTCREATORBUG-11632 Change-Id: Ie07e257dea4bfa1991a9fd492df3adc756cdb36d Reviewed-by: Tobias Hunger <tobias.hunger@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>
* BuildConfigurationFactory: Introduce prioritiesTobias Hunger2013-10-011-9/+5
| | | | | | | | | | | | | | | | | Introduce priorities for build configuration factories. This way plugins can register specialized build configuration factories, that e.g. can provide additional build steps. A negative priority signifies that a factory is not prepared to handle a request, the default build configuration factory shipped by the build system plugin will report a priority of 0. Add 100 to that for each specialization you add (e.g. a remote linux buildconfiguration factory would report 100, a specialization of that for mer will should report 200, etc.). Change-Id: I141a7a5a79166afdb7657d46eb7e86bd18d3abf6 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* TargetSetupPage: Generalize the pageTobias Hunger2013-09-271-1/+25
| | | | | | | | | | | | | | | | Generalize the target setup page and move it into projectexplorer Move the qmake specific code into a projectimporter class with a specialization for qmake projects in the qt4projectmanager. This change depends heavily on the BuildConfigurationFactory cleanups done earlier and completes that change in such a way that generic build configuration factories are now in theory possible. The remaining problem is how to select the best factory of several that claim to be able to handle a kit and that is left for the next patch. Change-Id: I47134cb1938c52adebcdc1ddfe8dbf26abbbbeee Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* BuildConfigurationFactory: Refactor codeTobias Hunger2013-09-171-44/+49
| | | | | | | | | | | | | | | | | | Refactor the code of the build configuration factories. The idea is to generalize the code so much that we can allow plugins to install custom build configuration factories for the platforms they support. To support this use case the following changes where done here: * BuildInfo class was introduced to describe one build configuration that can be created by a factory. * Factories report a list of BuildInfo to describe what they can produce. This fixes the need for factories to implicitly create one buildconfiguration and then create another one 'officially' to support debug and release build configurations to be set up for projects. * Do no longer work around factories to create build configurations. Change-Id: Ic372e4a9b5c582633b467d130538948472b89d91 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* BC: Move builddirectory handling into BC itselfTobias Hunger2013-08-281-23/+5
| | | | | | | | | Use setBuildDirectory() in the different BuildConfigurations instead of reimplementing that over and over again. Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Introduce Project::projectFilePath()Tobias Hunger2013-08-011-2/+2
| | | | | | | Use it instead of retrieving this information from the document. Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-091-2/+2
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CMakeBuildConfiguration: Remove unused includesDaniel Teske2013-04-111-7/+1
| | | | | Change-Id: I8b3f066490ffc7381400bb8b360c442a30fb039e Reviewed-by: Tobias Hunger <tobias.hunger@digia.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>
* | Qt4BuildConfiguration: Allow for "Release" and "Debug" BCsTobias Hunger2013-01-311-1/+1
| | | | | | | | | | | | | | No longer require some text additional text. Change-Id: I0bc1f64e6cbc9577cd4d79e04ce95b24a614ac7f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | CMake: Fix build directory for "Add Buildconfiguration"Daniel Teske2013-01-171-2/+7
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-8425 Change-Id: I58a47895fa882bcc53cad1ef764a307c714f2a1b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | CMake: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-231-11/+11
| | | | | | | | | | | | Change-Id: I23134b7eef222dcdb3425e2f2f6d62ab863009fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Replace BuildConfigWidge with NamedWidgetDaniel Teske2012-11-161-1/+1
| | | | | | | | | | | | | | They have a identical interface. Change-Id: Ia626496fbaffedefff6ee20b958cd505085d89f7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Remove BuildConfigWidget::init()Daniel Teske2012-11-161-1/+1
| | | | | | | | | | | | | | It no longer serves a purpose. Change-Id: Icdcb69c87112e295cefd4975dfa2b3d65818365a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | BuildConfiugration::subConfigWidge() Provide a default implementationDaniel Teske2012-11-161-9/+0
| | | | | | | | | | | | | | | | | | Which simply returns a BuildEnvironmentWidget. A long time ago BuildConfigurations had no environment, nowdays they do. So it makes sense for all BuildConfigurations to have the BuildEnvironmentWidget. Change-Id: I824c45df79a0dcd2b624bf67a4730fb5dab098bc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Move Project::subConfigWidgets to BuildConfigurationDaniel Teske2012-11-161-0/+9
| | | | | | | | | | Change-Id: Idf58ebbb02e9cd0ab4ff7e74fbed17250e274693 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Kit: Add createOutputParser methodDaniel Teske2012-11-021-14/+0
| | | | | | | | | | | | | | | | | | Which asks each KitInformation for their parser, thus currently creating a toolchain + qt chain if that is applicable. Remove all code that does that by hand from various buildsteps/buildconfigurations. Change-Id: I79a07ffd1dbe9a43bdbc838bc0098071aa412009 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-221-0/+1
|\ \ | |/
| * CMake: Use correct environment for new kitsDaniel Teske2012-10-191-0/+1
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-8073 Change-Id: I9c262fd553fa1af0e8de4900f465fe45aa8bbf78 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Remove unnecessary overloads of BuildConfiguration::baseEnvironment()Daniel Teske2012-10-171-6/+0
|/ | | | | Change-Id: I9805f5cb87f6c30b7952f9970b007f883eb62507 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kits should affect all buildconfiguration environmentsDaniel Teske2012-10-161-1/+0
| | | | | | | Not just qt4 and cmake but also generic projects. Change-Id: I4a7e86fb2dbf6c6e32b4da78953ad3199c554470 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* CMakeBuildConfiguration: Actually save / restore useKit settingDaniel Teske2012-10-111-0/+3
| | | | | | | | Task-number: QTCREATORBUG-7984 Change-Id: Iaa33e95bd827e8b8662c62e155c0e9aca3d2fd69 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CMake and Kits: Fix interaction between themDaniel Teske2012-10-051-14/+17
| | | | | | | | | | | | | | | On initial run we offer the user a choice between all the kits, which are compatible with the cached generator. After the initial run, the user can't change kits nor generators anymore. Except if the builds into a new directory or adds a buildconfiguration, then the user can choose between generators but not kits. Task-number: QTCREATORBUG-7940 Task-number: QTCREATORBUG-7928 Change-Id: I9b663435cd2e021f7fe08379c1c487a6aebe8976 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
* CMake: add Ninja supportPeter Kümmel2012-10-041-3/+18
| | | | | | | | | | | | | | The cmake wizard proposes also ninja if ninja support is available Ninja must be in PATH, but it is only called once, so it doesn't hurt. Task-number: QTCREATORBUG-7720 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Change-Id: If3c9c7ae55e6990fa16b031fc2998a8d8d9ed17a Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* s/profile/kit/Tobias Hunger2012-09-041-6/+6
| | | | | | | | | | | | | | | * Rename profiles to kits. * Update some strings: * projects mode has a Kits tab, not a Targets tab. * " Settings" was dropped from the sub-tabs of the Kits tab * menu entry "Build/Open Build/Run Target Selector" was renamed to "Build/Open Build and Run Kits Selector". * Use "Kit" instead of "Target" in miniprojecttargetselector. (The class was not renamed as it does indeed select targets, not kits) Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* use new id comparison operators to reduce line noise and save cycleshjk2012-08-061-2/+2
| | | | | Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compileDaniel Teske2012-07-181-3/+3
| | | | | Change-Id: I1f9afb9f802d8eae4d95e8505328d1dccafdc98a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* CMakeBuildConfiguration: Less qobject_casts more static_castsDaniel Teske2012-07-181-8/+4
| | | | | | | CMakeBuildConfigurations can only exist on CMakeProjects Change-Id: I8501e39f133fea854b953f9739e001cae1f2c0ea Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix cmake to parse Qt build application outputTobias Hunger2012-06-291-2/+13
| | | | | | | Task-number: QTCREATORBUG-2450 Change-Id: I7e041aece19b863b59fe2b2164b126cf414f82a9 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Profile introductionTobias Hunger2012-06-211-76/+51
| | | | | | | | | | | | | Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use Core::Id in project-related objectsTobias Hunger2012-04-251-11/+10
| | | | | | | | Use Core::Id for all the project related objects in favor of plain QStrings. Change-Id: I790ab40cb29899efdb49c413a77609486f52e683 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-1/+1
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | more style fixes of string literal accesshjk2011-11-021-4/+3
|/ | | | | Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096 Reviewed-by: hjk <qthjk@ovi.com>
* Header cleanup in ProjectExplorer.Friedemann Kleint2011-08-181-0/+1
| | | | | | Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09 Reviewed-on: http://codereview.qt.nokia.com/3178 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
View Lorry Controller Status