feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
42,459 Commits 108 Branches 368 Tags
bbe8195d01d38e31df7900bce9d93cb7a162f510
Commit Graph

36 Commits

Author SHA1 Message Date
Daniel Teske
8cbe009cc4 QmakeProject: Use QMAKE_PROJECT_NAME to set the display name 
Of both nodes and run configurations.

Change-Id: I04cae590561f3c7b355a3385856dca13ebcd7acf
Task-number: QTCREATORBUG-13950
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-09-02 10:52:24 +00:00
hjk
93fd1d0507 {Q,C}makeProjectManager: Adjust tooltip capitalization 
Follows suit after 3d78ec69bb.

Change-Id: I1756e0e50dcf414db9ea3f3b2092f8eeb647ae80
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-07-07 07:51:57 +00:00
Jarek Kobus
a73ad816a3 QMakeProjectManager: Introduce member initialization. 
Change-Id: I69df0c22a215b2df12f63fdc47082e9797fc02ac
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-06-23 21:03:41 +00:00
hjk
f3a46e5ad5 QmakeProjectManager: Remove some dead code 
The kitChanged() handling was left over after d972b3b091.

Change-Id: I849b2bc941d17d60e1873357585b37480baeaa6e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-05-18 15:41:22 +00:00
hjk
d972b3b091 QtSupport: Remove SimulatorQt 
Unused for years.

Change-Id: I721068ecf18afb09fb928a348cbb5e8127a3dfc2
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-04-24 13:45:08 +00:00
Orgad Shaneh
88e7f935f4 ProjectExplorer: Use FileName for Node::path 
Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 13:14:03 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
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
 2015-02-12 17:29:21 +01:00
Orgad Shaneh
8b5dcc13c5 Replace QFileInfo::fileName() with FileName::fileName() 
Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-29 11:15:43 +00:00
Nikolai Kosjar
51219a8815 {Qbs,QMake}ProjectManager: Make executable selectable/copyable 
Change-Id: I7947ec85173f0898d54333f174fa6c14bcb051d6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-01-26 10:07:34 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
hjk
bbdf1dae3e QmakeProject: Add macro expansion to desktop qmake runconfig widget 
Change-Id: I434b7308c927c65280671ec7eb4e4dbad92edd6a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-11-05 20:38:48 +01:00
hjk
35e883eea0 Utils: MacroExpander API cosmetics. 
Make const-correct, add convenience function for commandline parameter
expansion.

Change-Id: I12c3651e4e7b8a0a9319d1dfbea676b622b1a41a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-22 10:21:21 +02:00
hjk
ef563d8085 MacroExpander: Fall back to global expander 
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-16 16:32:58 +02:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
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
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Daniel Teske
347cb21ae2 DesktopQmakeRunConfiguration: Optimize response to proFile parsing 
Only emit the environment changed signal after everything has parsed.

Change-Id: Iba26c8ba2fc7de9e03ec1368917985538ffbbfb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-18 17:10:06 +02:00
Daniel Teske
7dbb9b2678 DesktopQmakeRunConfiguration: Use Qt5 connects 
The future is now.

Change-Id: I68fa2fc75d8fe4437600a808949892e9002d950d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-15 11:54:52 +02:00
Erik Verbruggen
e815fdac76 Qmake Project Manager: make QTC_ASSERT actually useful. 
Change-Id: I0ca381dca2f7a50e3638f10c77db9b6621fb32c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-11 11:48:32 +02:00
Christian Kandeler
93304df038 Always pass Core::Id by value. 
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-07-01 11:52:08 +02:00
Alessandro Portale
fe08cb8902 Centralize error/warning/info icons 
There are multiple copies of these pngs in different plugins.
Let's have one version in core, also as @2x variant.

Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-06-17 22:45:09 +02:00
Daniel Teske
c78258cd57 Allow the user to restrict rc creation to certain .pro 
Task-number: QTCREATORBUG-10953
Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-16 13:04:23 +02:00
Daniel Teske
204de740ec QmakeProject: Replace applicationProFilePaths by idsForNodes 
Change-Id: Ie10e8cb93f26eb2087272646668fafd480b0208d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-16 10:30:57 +02:00
Orgad Shaneh
af5b3246cf ProjectExplorer: Get rid of LocalApplicationRunConfiguration::RunMode 
Change-Id: I132eb2615842ad7fdf6d7fa0f87d8c2c0c77203e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-28 13:22:11 +02:00
Alessandro Portale
d6b12213a7 ProjectExplorer: Use constants for compile_warning.png and _error 
Instead of repeating strings like
   ":/projectexplorer/images/compile_warning.png" all over the code,
we should use constants for it.

Change-Id: I91b36838d6da0a2332381e433788e796948d26db
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 16:51:59 +02:00
Tobias Hunger
dc61b989ac Project: Use Utils::FileName as return type for projectDirectory(...) 
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 11:48:10 +02:00
hjk
2e757deab4 ProjectNodes: Refactor runConfigurationsFor() 
Rename to runConfigurations() and remove the node argument which is
available as 'this'. Adjust const-ness of node argument in
RunConfigurationFactory::runConfigurationsForNode

Change-Id: Icb63e96a305152f90135a2656536de2581faafaf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-04-29 12:35:29 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines. 
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-04-22 10:06:40 +02:00
Tobias Hunger
97895e9026 HistoryCompleter: Do not use a generic ids for history entries 
Do not use BuildDir.History, SourceDir.History or WorkingDir.History.

Change-Id: I0df95b88680efdc2ecaec68625ab476499ee1fb8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-10 10:25:52 +01:00
Daniel Teske
81f39973e1 QmakeRunConfiguration: Fix copy-ctor to copy m_forcedGuiMode 
Only used for simulator qt, so not essential at all.

Change-Id: I4736e3fd1f84e009441fd89ae40f4debfd7a1d1a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 14:08:07 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
hjk
bad8a451a6 Debugger: Remove support for non-Python GDB 
This affects mainly Apple's version of GDB. Mac users are advised to
use LLDB, or some recent build of FSF GDB.

Change-Id: I6a7fbb591e79f737e12d08b0e881e9e4d1d9660c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-01-06 15:41:16 +01:00
Tobias Hunger
c4b2da9a33 Qmake: Add history completer to path choosers 
Change-Id: I1bcf9cf626d0f42520442ec8e9d7be413e16a102
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-26 11:25:26 +01:00
Orgad Shaneh
4442a92729 Braces cleanup 
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-14 08:13:52 +01:00
Tobias Hunger
bb06ff83d7 LocalRunConfiguration: Do not add a LocalEnvironmentAspect 
This makes the specializations responsible to register the environment aspect
that makes the most sense for them.

The only real user of this is the QmlProject, which added its own
EnvironmentAspect on top of LocalEnvironmentAspect set by the base
class.

Change-Id: I2ad8c23a008e249dc919491a5fd397ec04502375
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-11-04 14:50:47 +01:00
Tobias Hunger
cc7511cb9b Rename the QmakeRunConfiguration to DesktopQmakeRunConfiguration 
Also rename the related factory and config widget.

This was necessary since QmakeRunConfigurationFactory was already
taken by the base class.

Change-Id: I37875935101b7560ad64c8a8c27d821c9810b387
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-29 18:42:49 +01:00