feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,841 Commits 108 Branches 368 Tags
97dc1d4ab47e98952deca8a3a0624466219b83ef
Commit Graph

117 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
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
Robert Loehning
998281c5c9 "Build Issues" was renamed to "Issues" 
Change-Id: If514e2497a52456bfd16aaebf2a7c83def4621f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-25 11:57:10 +02:00
Daniel Teske
a609689a2e Fix make not found in environment 
Change-Id: I5bfbe8cf36556cceec02011012d2d1c09d0c0ebc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-20 14:51:02 +02:00
Daniel Teske
85cfc50121 Prepend "L" to MAKEFLAGS for nmake and jom 
Change-Id: I2a36b0a194cda1907b07155449cd610171cc1df9
Task-Nr: QTCREATORBUG-6167
Reviewed-on: http://codereview.qt-project.org/5814
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-06 13:08:58 +02:00
Daniel Teske
b96d7b9bd8 Make Qt4ProejctManager::MakeStep::run multithreading safe 
Change-Id: I416360d35681d2721878cb9fefd861d6e1f209b4
Reviewed-on: http://codereview.qt-project.org/5451
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-23 12:30:34 +02:00
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
Friedemann Kleint
d4e1d7c6ad Header cleanup in Qt4ProjectManager. 
Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.

Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-18 16:50:01 +02:00
Leena Miettinen
f1889864db UI text: check capitalization and tooltips 
Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4
Reviewed-on: http://codereview.qt.nokia.com/569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-22 10:05:33 +02:00
dt_
2cc7bea066 Remove BuildStepConfigWidget::init() 
It serves no purpose anymore.

Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14
Reviewed-on: http://codereview.qt.nokia.com/217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-30 14:44:33 +02:00
dt
e3842f9973 Move QtParser to QtSupport plugin 
This way we can make use of it in the cmake plugin

Change-Id: Ie1887d49ea616ec62d91a73b4daa75d69cef61c9
Reviewed-on: http://codereview.qt.nokia.com/91
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:47:02 +02:00
dt
8e171e0be0 Qt Version refactoring 
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
 2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Tobias Hunger
1c3360998e Update makestep on toolchain changes 
This way the makestep configuration widget's details will reflect
the actual arguments used.
 2011-04-14 17:25:02 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
3a75137acd Qt4Project: Don't show a error on initial building 2011-03-25 17:22:04 +01:00
dt
9b9f19dd7d Qt4Project: do not show a error on make clean without a Makefile 
Task-Nr:
 2011-03-24 20:44:46 +01:00
dt
2639888a33 QmakeStep: Warn once for missing toolchains 2011-03-24 19:45:19 +01:00
Tobias Hunger
2af168e109 Do not try to build in Qt4 makestep without a tool chain 
Reviewed-by: dt
 2011-03-24 15:44:58 +01:00
Tobias Hunger
7c1e0853a5 Show all parameters of a makestep 
Show everything we pass on to make, incl. the parameters we pick up from
the Toolchain via the QtVersion.

Reviewed-by: dt
 2011-03-14 14:47:59 +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
Tobias Hunger
3ec173bfdd Qt4: Simplify makestep 
* Remove unnecessary member variable.
 2010-12-09 11:05:19 +01:00
dt
39f6652cf5 Header cleanup 2010-12-07 16:48:07 +01:00
dt
68d6bfe33b Output parsers: Make target specific code pseudo generic 
Introduce IOutputParser::setWorkingDirectory and
IOutputParser::hasFatalErrors()

Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
Oswald Buddenhagen
79be54ed8c replace env variable injection with pervasive expando support 
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
 2010-11-17 13:19:08 +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
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header. 
Acked-By: dt
 2010-11-01 14:25:24 +01:00
dt
a36dc1d41e Qt4ProjectManager: Support Makefile variable 
Pass on the makefile to make, check the right makefile for importing.

Task-Nr: QTCREATORBUG-102
 2010-10-05 17:43:35 +02:00
Tobias Hunger
d4c1c1f8b1 Update make command on changes 
Task-number: QTCREATORBUG-2489
 2010-09-29 11:17:32 +02:00
Tobias Hunger
16f2712403 Use PathChooser in MakeStep config widget 
TaskNumber: QTCREATORBUG-2479
Reviewed-by: Robert Loehning
 2010-09-28 13:50:09 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
Tobias Hunger
616a9b13f0 Enable restoring the default names of project configuration items 
* Enable support for this in all ProjectConfiguration items
   (Targets, projects, BCs, DCs, RCs, etc.). This is nicer
   than having custom code in individual configuraiton items.

Reviewed-by: dt
 2010-08-24 16:04:51 +02:00
Tobias Hunger
c07a6118a1 Fix build no longer failing on broken ABLD builds (Symbian) 
* Make the behaviour less implicit while doing this: Hopefully
   that will stop it from getting broken again.
 2010-08-12 12:19:42 +02:00
Tobias Hunger
6311f0f99f Add parser for sbsv2 (new Symbian build system) 
* Add parser
 * Use it
 * Improve parser setup in Qt4 makestep
 * Add tests for the sbsv2parser
 2010-08-11 15:41:54 +02:00
Tobias Hunger
221cc38788 Add output parser for Qt-specific utilities 
* Handle moc warnings there
 * Add unit tests
 * Use new parser in Qt's makestep

Task-number: QTCREATORBUG-1908
 2010-08-03 17:26:07 +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
615cda8430 Fix compile output to be readeable with dark themes 
This changes the colors to be a mix of red/blue and the foreground
color. If the regular text color is either of those, well...
 2010-07-15 11:11:21 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type 
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
 2010-07-06 18:36:30 +02:00
dt
181cecbb32 Port the compile output window away from HTML to QTextCharFormat 
Is more then twice as fast
 2010-06-08 15:23:58 +02:00
Tobias Hunger
62e4c92f26 Stop build on fatal make errors 
... ignoring a error code of 0 from Make. This is necessary to
detect build failures on symbian

Do not show errors when ignoring the return value of a BuildStep
either.

Task-number: QTCREATORBUG-985
Reviewed-by: dt
 2010-04-09 18:04:23 +02:00
dt
e92c30f15a Fix not updating makestep make label on qt version change 2010-04-07 13:49:51 +02:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
dt
0d4fdd291a Use a type enum instead of duplicating functions between build and clean 
That is e.g. buildSteps() and cleanSteps() --> steps(type)
 2010-03-16 17:45:08 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00