feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,312 Commits 108 Branches 368 Tags
d211ef0e06a0a54217e6c25d630316c0344904c8
Commit Graph

58 Commits

Author SHA1 Message Date
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
dt_
2224eb70bb Run cmake dialog: More intelligent hardcoded font 
Platform specific now.
 2011-04-27 15:58:54 +02:00
dt_
29d6f9b788 Always append cmake output 2011-04-27 14:45:30 +02:00
dt_
eaabc9f06f Use fixed font in the cmake output window 
Task-Nr: QTCREATORBUG-4658
 2011-04-27 14:45:30 +02:00
dt
8a276097c6 Fix available toolchains for cmake and generic project manager 
Reviewed-By: hunger
 2011-04-13 13:38:58 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Jarek Kobus
798225ce0a Update source strings 
Reviewed-by: Pawel Polanski
 2011-03-31 09:58:19 +02:00
Tobias Hunger
b2df065b56 Use distinct ABIs for MSVC versions 
Use a distinct ABI OS flavor for each of the supported MSVC versions.

Task-number: QTCREATORBUG-4129
 2011-03-21 15:46:42 +01:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
hjk
a8ae618d75 toolchain: fix enum naming style 
Reviewed-By: Tobias Hunger
 2011-02-23 17:56:33 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support 
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
 2011-02-21 18:33:23 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
dt
30044e842f CMake Run Page: Colorize output and disable finish on cmake error 
Task-Nr: QTCREATORBUG-2592
 2010-10-04 17:53:15 +02:00
Tobias Hunger
f06512d5f7 Use ExistingCommand in PathChooser where it makes sense 2010-09-24 16:35:09 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
dt
aa8e2e8e0f Allow relative paths in Build directories, Working Directories 
Relative to the project's directory.
 2010-09-17 15:32:41 +02:00
Leena Miettinen
0037296d70 Doc - Fix UI text capitalization to follow the KDE style guide. 
Reviewed-by: dt
 2010-09-15 10:30:51 +02:00
dt
5fae9b94c0 Cmake: Add a "Reconfigure project" to the Project Page 2010-09-02 13:57:35 +02:00
dt
a12daa6262 Change the build directory for cmake 
It is now in the parent directory of the src directory.
Task-Nr:   QTCREATORBUG-1109
 2010-04-12 17:39:59 +02:00
Jarek Kobus
20c0817a3f Replace QWizard with Utils::Wizard 2010-03-31 15:22:14 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace 
doing it in 1.3 as well to avoid possible later conflicts
 2010-01-29 21:33:57 +01:00
dt
24a4590767 Cmake: Let the generator determine the toolchain 
Otherwise we need to parse the cbp file, which happens only if the
buildconfiguration gets active. Also try to decouple a few internals a
little bit by using signals. The CMakeProject still handles a few things
directly instead of via signals, more to come eventually.
 2009-12-07 15:00:17 +01:00
dt
c8e7df16eb Show a cancel button in the opening cmake projects wizard. 
Allows the user to change his mind. :)
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
 2009-11-03 14:37:34 +01:00
dt
1253c55d56 Fix a race in CMakeProjectManager::createXml 2009-10-21 13:45:49 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
dt
6639389c74 Use !atEnd() instead of canReadLine(). The later is rather broken. 2009-09-23 15:40:19 +02:00
dt
0f35338714 Fix a one off error in figuring out the cached generator. 
Though there's still a bug in that canReadLine() returns false.
 2009-09-23 14:34:53 +02:00
dt
261796c3c6 If no cmake executable is specified or a invalid path, ask the user. 
Directly in the wizard and save that to the settings. Also give feedback
if a wrong path was entered.
 2009-09-23 14:33:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
66663090e4 Add the directory we are refering too in the cmake wizards can't build 
out of source page.
 2009-08-13 18:05:12 +02:00
Friedemann Kleint
cbfa2c0191 Fixed translation glitches. 2009-07-31 16:41:12 +02:00
dt
935a54c167 Always show the wizard even if we already have a recent enough cbp file. 
That case is a corner case, it can happen if the user has run the codeblocks generator on the command line or if the user deleted the .user file. We mostly ask to get the user a chance to check that we set the correct generator. Or let him select the correct one if there are multiple msvc versions.
 2009-07-03 12:46:19 +02:00
dt
40ff6ab2c4 Make msvc and cmake play together. 
Note: This requires a cvs cmake and is not fully tested yet. This adds a
few missing pieces, so now opening new never built projects without a
.user file on systems with just one VS installation should work.
 2009-07-02 16:44:51 +02:00
dt
560b06391d Add msvc support to cmake plugin. Depends on a cvs version of cmake. 
The CodeBlocks - NMake Makefiles generator combination is only available
in the cvs version of cmake.
This has not been extensively tested at all.
 2009-07-02 11:30:29 +02:00
con
07187e0a80 Custom signature support. 
Not able to give it an additional passphrase yet, though.
 2009-06-24 13:41:48 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10: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
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
Friedemann Kleint
14e39ba5af Fixed translation issues. 2009-05-07 15:34:52 +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
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