feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,589 Commits 108 Branches 368 Tags
afea900b966d202435292cb15101ee71b9299f19
Commit Graph

3443 Commits

Author SHA1 Message Date
con
2919c21007 Cherry-pick: Update license headers and sales contact details. 
Reviewed-by: Trust Me

Conflicts:

	src/libs/cplusplus/CppBindings.cpp
	src/libs/cplusplus/CppBindings.h
	src/libs/cplusplus/FastPreprocessor.cpp
	src/libs/cplusplus/FastPreprocessor.h
	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
	src/plugins/cpptools/cppcurrentdocumentfilter.h
	src/plugins/cpptools/cppsemanticsearch.cpp
	src/plugins/cpptools/cppsemanticsearch.h
	src/plugins/duieditor/parser/qmljs.g
	src/plugins/duieditor/parser/qmljsast.cpp
	src/plugins/duieditor/parser/qmljsast_p.h
	src/plugins/duieditor/parser/qmljsastfwd_p.h
	src/plugins/duieditor/parser/qmljsastvisitor.cpp
	src/plugins/duieditor/parser/qmljsastvisitor_p.h
	src/plugins/duieditor/parser/qmljsengine_p.cpp
	src/plugins/duieditor/parser/qmljsengine_p.h
	src/plugins/duieditor/parser/qmljsgrammar.cpp
	src/plugins/duieditor/parser/qmljsgrammar_p.h
	src/plugins/duieditor/parser/qmljslexer.cpp
	src/plugins/duieditor/parser/qmljslexer_p.h
	src/plugins/duieditor/parser/qmljsmemorypool_p.h
	src/plugins/duieditor/parser/qmljsnodepool_p.h
	src/plugins/duieditor/parser/qmljsparser.cpp
	src/plugins/duieditor/parser/qmljsparser_p.h
	src/plugins/duieditor/parser/qmljsprettypretty.cpp
	src/plugins/duieditor/parser/qmljsprettypretty_p.h
	src/plugins/duieditor/rewriter/rewriter.cpp
	src/plugins/duieditor/rewriter/rewriter_p.h
	src/plugins/duieditor/rewriter/textwriter.cpp
	src/plugins/duieditor/rewriter/textwriter_p.h
	src/shared/cplusplus/ASTClone.cpp
	tests/manual/cplusplus/main.cpp
 2009-06-16 17:26:44 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
con
3ddb7b02f1 API review of IRunConfigurationFactory. 
Done with dt.
 2009-06-12 17:58:13 +02:00
Roberto Raggi
d08b90b494 Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-11 11:32:47 +02:00
dt
182161f9bf Fix window title for cmake wizard 2009-06-10 16:03:16 +02:00
Henrik Abelsson
7d6031b509 In cmake run dialog, let two enter strokes run cmake and close dialog. 
Merge-request: 596
Reviewed-by: dt <qtc-committer@nokia.com>
 2009-06-09 15:58:01 +02:00
kh
fca2dcfe28 Fix compilation with namespaces. 
Reviewed-by: dt
 2009-06-08 14:47:13 +02:00
con
57cd26548e Version bump also in master. 2009-06-04 11:00:28 +02:00
con
2ac1f797ad Merge commit 'origin/1.2' 
Conflicts:
	src/plugins/coreplugin/welcomemode.ui
 2009-06-03 11:36:49 +02:00
con
e9b2613dc0 Version bump. 2009-06-02 15:34:58 +02:00
dt
6d18c530a8 Add options also to CMake and CustomExecutable RunConfiguration 
Well this enough environment settings for 1.2.
 2009-06-02 12:27:26 +02:00
dt
599b21216d Add environment widget to the custom executable runconfiguration. 2009-05-27 18:33:57 +02:00
dt
10151809c4 Add Environment settings to CMakeRunConfiguration 2009-05-27 18:33:50 +02:00
dt
5d75804b93 Refactor the checkbox "Clear system environment" out. 
I don't want it in the run configurations.
 2009-05-27 14:58:16 +02:00
dt
adc7a7204b Use the environment specified for the current build configuration to 
rebuild the cbp file

I think that makes sense, we'll see.
 2009-05-27 14:58:11 +02:00
dt
14a79dad58 Simplfy API of CMakeOpenProjectWizard remove some left over QStringList 
We don't call it with a list anymore, so make it just a QString
 2009-05-27 14:58:07 +02:00
dt
0bda19a099 Add the ability to set a build environment also for CMake projects. 
Note: as for qt projects, this is also used for running. And we don't
use it for running cmake yet.
 2009-05-27 14:58:02 +02:00
dt
19f7f99b61 Report finished in all cases. 2009-05-25 17:09:38 +02:00
dt
dc3641b9e1 Fix warning. 2009-05-25 13:42:03 +02:00
dt
72f5be29a2 Support multiple buildconfigurations with cmake 
We didn't support having different build directories.

Task-Nr: 251632
 2009-05-18 18:07:52 +02:00
dt
449e0b54c5 Unneeded dependencies on Help 2009-05-15 15:16:46 +02:00
Friedemann Kleint
4e7f2f8d7f Fixed translation glitches. 2009-05-14 17:02:30 +02:00
Alessandro Portale
2be7226215 Rename qworkbenchplugin.pri to qtcreatorplugin.pri 2009-05-08 16:42:48 +02:00
Friedemann Kleint
14e39ba5af Fixed translation issues. 2009-05-07 15:34:52 +02:00
dt
617ddf03e3 Implement a AbstractMakeStep which takes the common code from 3 places. 
The common code for all makesteps i mainly tracking in which directories
we are currently building. And guessing the filename from that
information. And creating a buildparser from a name.
 2009-05-05 15:08:29 +02:00
dt
2b302332b8 Move QtVersionManager, QtVersion and QtOptionsPage back 
After all I don't need all that stuff in the cmakeplugin, all i needed
is now bundled in debugginghelper.h/cpp
 2009-04-28 12:45:04 +02:00
dt
48fe0f450f Refactoring: Move all the debugging helper static methods into a class 
Enables me to move some stuff back again.
 2009-04-24 16:21:51 +02:00
dt
b419403b0f Refactoring: Use one common code to find the debugging helper library 
Remove duplicated code from cmakeprojectmanager.
 2009-04-24 14:59:47 +02:00
dt
8f738dfcc8 Add the *.pluginspec to OTHER_FILES so that we can use Locator for them 
Hopefully i didn't miss a plugin.
 2009-04-22 15:06:58 +02:00
dt
ef8e69d96a Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-04-22 12:18:04 +02:00
con
23d0cb3180 Merge commit 'origin/1.1' 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/gdbengine.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	src/plugins/quickopen/QuickOpen.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
 2009-04-21 17:50:31 +02:00
dt
84ee1653f4 Allow changing the build directory, and reparse. 
Task:  250418

This also moves us closer to supporting multiple build configurations
properly.
 2009-04-20 17:59:36 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
dt
48dd25866e Show also error output in the cmake run log. 2009-04-20 12:18:32 +02:00
con
8b4b3e5f5a Version bump 1.1.0 2009-04-20 10:25:22 +02:00
con
412a4b027d Merge commit 'origin/1.1' 
Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/gdboptionpage.ui
 2009-04-17 15:17:31 +02:00
dt
ad1047925b Fix the directories the cmakelugin checks for the debugger plugin 
I need to refactor that code for 1.2.
 2009-04-17 12:27:04 +02:00
dt
d0159d7c7c Small tweaks to the cmake open project wizard. 
Note: The use is now forced to run cmake. This is rather suboptimal, but
currently cancel doesn't do the correct thing so we prevent that.
 2009-04-15 16:22:55 +02:00
Oswald Buddenhagen
e6843ff5bc Merge commit 'origin/1.1' 2009-04-09 12:04:50 +02:00
dt
e6779aaeb2 Use QT_INSTALL_DATA instead of path() for searching the debugger helper 2009-04-08 15:16:02 +02:00
con
423744e4e1 Version bump. 2009-04-08 11:47:14 +02:00
con
de6a0cfea9 Version bump. 2009-04-08 11:45:30 +02:00
dt
ef2b100e6e Typo fixes for cmake wizard pages. 2009-04-07 15:27:51 +02:00
dt
7fba9fd799 Typo fix 2009-04-07 15:00:30 +02:00
dt
0a406dbe1f Add a makestep that cleans up 
Make clean and rebuild all work.
 2009-04-07 15:00:16 +02:00
dt
3d863b211a Show progress for building cmake projects. 
Parse percent output of cmake, report via QtConcurrent and modify the
BuildManager to also report the progress to the ProgressManager.
 2009-04-07 13:52:28 +02:00
dt
16be88e992 Make the layout of the CMakeRunPage nicer. 2009-04-06 17:07:51 +02:00
dt
3b6d8b8f4d Add the ability to add Runconfigurations for cmake-targets we know about 
Task: 250415
 2009-04-06 17:01:26 +02:00
dt
738ef0b121 Make CMake Open Project Wizards output text read only. 2009-03-31 15:02:09 +02:00
dt
f65c2a501c Merge commit 'origin/master' 2009-03-31 12:21:23 +02:00