feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,719 Commits 108 Branches 368 Tags
21d204ad5c0e691230ea24484f40e89a3c85d4ab
Commit Graph

218 Commits

Author SHA1 Message Date
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
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
 2011-11-11 09:46:25 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Andre Hartmann
6de2b28130 Implemented rename file feature for generic projects. 
Change-Id: I195c48c5eaa458bdb537a8de4d7b71f17a704f41
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-27 12:11:16 +02:00
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer. 
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-18 13:47:33 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/) 
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-29 12:19:11 +02:00
Tobias Hunger
c56c9cf4e7 Generic Project: Propagate toolchain changes 
Change-Id: I629101990fb041aa421803dc5485e59acc8a7dd2
Reviewed-on: http://codereview.qt.nokia.com/1525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-25 12:06:03 +02:00
Daniel Teske
edf0424bb8 Add a dialog for editing the file list of generic projects 
Task-Nr: QTCREATORBUG-5112

Change-Id: Ic39c4346f2c64b05c314f3c03d963994e043dc45
Reviewed-on: http://codereview.qt.nokia.com/500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
 2011-06-20 14:38:23 +02:00
Oswald Buddenhagen
9ac137fb06 add auto-saving of modified editors 
Task-number: QTCREATORBUG-2847
 2011-05-12 20:10:03 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +02:00
Oswald Buddenhagen
fae7dc9584 add errorString output argument to IFile::reload() & IEditor::open() 
add/unify read error handling in all affected classes
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
f1f9904d35 add errorString output argument to IFile::save() 
this centralizes error reporting (in fact, in most cases it adds any in
the first place).

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +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
hjk
1738d08ffc projectexplorer: move project{Context,Language} from IProjectManager to Project 
Reviewed-by: dt
 2011-04-12 12:46:26 +02:00
hjk
3df1d524b7 genericproject: cosmetics 2011-04-12 12:18:11 +02:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
Thorbjørn Lindeijer
87d9caa32d Generic project: Refresh configuration when tool chain changes 
Reviewed-by: Roberto Raggi
 2011-03-11 12:37:29 +01:00
Thorbjørn Lindeijer
c7f4dc2da9 Generic project: Fixed the connection to updateToolChainList 
Reviewed-by: Roberto Raggi
 2011-03-11 12:37:29 +01:00
Thorbjørn Lindeijer
82430a6b37 Generic project: Made C++ code model work better without a tool chain 
When no valid tool chain is selected, no project info update was done at
all. After this patch, at least the project defines and include paths
are used.

Reviewed-by: Roberto Raggi
 2011-03-11 12:37:29 +01:00
Friedemann Kleint
562265d58c Toolchains: Header cleanup. 2011-02-28 16:50:14 +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
hjk
d6a459c332 cppmodelmanagerinterface: use singleton instead of object pool 2011-01-05 09:56:00 +01:00
Christian Kamm
5f50a6ae34 C++: Move the ModelManagerInterface from CppTools to CPlusPlus. 2011-01-04 15:58:21 +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
dt
8697072ce4 ProjectExplorer: Move ITargetFactory to object pool 
Makes multiple target factories per project possible

Reviewed-By: hunger
 2010-12-07 13:17:12 +01:00
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target 
Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header. 
Acked-By: dt
 2010-11-01 14:25:24 +01:00
Tobias Hunger
37c641e668 Use PathChooser::rawPath() where it makes sense 2010-09-24 16:35:08 +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
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +02:00
Tobias Hunger
b6f1dbeeb0 Remove obsolete ways to set the display name 
* Now that there is a generic way to rename configurations:
   Remove individual renaming methods from all over the codebase

Reviewed-by: dt
 2010-08-24 16:04:51 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment 
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
 2010-08-02 14:21:05 +02:00
dt
9bc9fe73e1 File renaming 
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
 2010-05-12 14:14:44 +02:00
Tobias Hunger
f261515642 Fix possible crash in the generic project 
Make sure we have a RunConfiguration after importing a project from
earlier versions of creator.

Tasknumber: QTCREATORBUG-1277
 2010-04-27 10:58:36 +02:00
dt
f093d0806b Cancel code model indexing on project closing and full code model update 
Task-Nr: QTCREATORBUG-1151
 2010-04-26 12:29:50 +02:00
dt
3de0668894 Linux icc parser 
Reviewed-By: hunger
 2010-04-12 15:05:11 +02:00
dt
9ddd7a59d7 Revert "Progress so far" 
This reverts commit b1a121c54f.

Accidentally pushed the linux icc parser before it was ready.

Conflicts:

	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2010-04-08 10:49:20 +02:00
dt
b1a121c54f Progress so far 2010-04-07 13:51:07 +02:00
dt
a3f827b1b8 Remove isApplication() and simplfy startup project logic 2010-03-25 17:36:39 +01:00
con
d6061a23e1 Refactor the externally modified file handling 
Reviewed-by: dt
 2010-03-22 16:01:55 +01:00
Thorbjørn Lindeijer
c0b42868b0 Preserve the user-set build directory for Generic Projects 
Previously it would be converted to an absolute path. Preserving the
original path allows it to be set as relative to the project.

Reviewed-by: dt
 2010-03-15 16:27:39 +01:00
Thorbjørn Lindeijer
2a93b5401d Move build environment customization down to BuildConfiguration 
The functionality was duplicated between the Qt4 and CMake build
configurations and their configuration widgets. This change moves it
down to BuildConfiguration, in addition also making it available for the
Generic Project.

Also provides an upgrade path for the configuration.

Task-number: QTCREATOR-24
Reviewed-by: dt
Reviewed-by: Tobias Hunger
 2010-03-12 13:01:04 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thorbjørn Lindeijer
5c715fa11f Some small code style fixes 2010-02-25 16:49:43 +01:00
Laurent Desmecht
5f9e4c7e0d Allow modification of the configuration name in GenericBuildSettingsWidget 
Merge-request: 117
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-02-25 16:49:43 +01:00
Thorbjørn Lindeijer
3c1142d7d7 Expand environment variables in Generic Project file lists 
Environment variables will now be expanded in the Generic Project file
and include path lists. They have to be written like $$(VARIABLE), like
in qmake .pro files.

Task-number: QTCREATORBUG-366
 2010-02-11 16:46:30 +01:00