feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
76,860 Commits 108 Branches 368 Tags
2746b410d067c15d86489eb2fb65cf7edaebdc1e
Commit Graph

154 Commits

Author SHA1 Message Date
hjk
271da8c06b buildsettingswidget: remove a function called only once 
Change-Id: I6bce707b0dd2cbf207c02b89b27a2c0a31f62126
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-03 12:57:07 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Orgad Shaneh
dc251deccf Project: Fix crashes 
Task-number: QTCREATORBUG-7563

Change-Id: Ib7630e9ca82a0b09703ff948af95af53ced05730
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-25 10:23:32 +02:00
Tobias Hunger
2431456216 Profile introduction 
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-21 12:08:12 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects 
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-25 11:49:19 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Daniel Teske
e3d14f7c39 Make Open Project wizard skippable 
Task-Nr: QTCREATORBUG-6063

Change-Id: Ieace3e9e68b4e0342c35ac7c279f4b0b61076419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 09:36:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Friedemann Kleint
ced6fc4136 ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII. 
- Add missing translations
- Remove some unneeded conversions.

Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-09 16:45:08 +01:00
Daniel Teske
01fed18623 Remove one messagebox when removing a buildconfiguration 
Since the user is asked twice atm.

Change-Id: I07221c47ab96bd9881d611cc2070ef43333cd2a0
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-04 14:02: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
hjk
2cbcf263cf projectexplorer: More consistent '...' 
Used for buttons that open additional dialogs, but not comboboxes.

Change-Id: I9b40eac236f18b4c0b2e358ddeccb953024e8d50
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-02 12:50:14 +01:00
Daniel Teske
e202e4b8e0 Fix various crashes 
Task-Number: QTCREATORBUG-6365

Change-Id: I19a200e3c811eef83d591f6eacca3e48eb0fba8f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-31 12:49:06 +01:00
hjk
58f59e133f settingspropertypages: style 
Change-Id: I2430de067715374ae7e31fefacf3e7970db89754
Reviewed-on: http://codereview.qt-project.org/5735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-28 18:08:16 +02:00
hjk
5cfc7bd582 projectexplorer: this is never 0 
Change-Id: I3245a7d46bc29480b3d8029e79f7b8fcb359ea90
Reviewed-on: http://codereview.qt-project.org/5737
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-28 18:07:47 +02:00
Jarek Kobus
2244911826 Implement Code Style schemes 
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-23 10:23:15 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
61700c16e1 projectexplorer: s/IPropertiesPanel/PropertiesPanel. No need for subclassing. 2011-04-14 13:32:30 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02: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
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target 
Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
Tobias Hunger
0a2a28ec47 Do not allow all WS names in Run-/Deploy-/BuildCOnfigs 
Task-number: QTCREATORBUG-2584
 2010-10-05 11:41: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
Friedemann Kleint
66ad76de4f I18n: tr-fixes. 2010-09-13 16:51:43 +02:00
Tobias Hunger
a1e103c28d Make configuration name more visible 
* Make the name of the configuration about to be removed more visible.
 2010-08-30 16:46:40 +02:00
Tobias Hunger
fef32dff44 Ask the user before removing Build-/Deploy- and RunConfigurations 
Task-number: QTCREATORBUG-2208
 2010-08-30 12:06:47 +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
efe4d80772 Add button to rename Build-/Deploy-/RunConfigurations 
* Add a rename button for Build-, Deploy- and RunConfigurations.

Reviewed-by: dt
 2010-08-24 16:04:50 +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
Tobias Hunger
54584044ca Add Deploy steps 
* Add "Deploy" to BuildSteps::Type
 * Update UIs to handle deploy steps
 * Turn existing package creation steps from build type to deploy type
 * Move packaging steps into deploy steps when loading projects

Reviewed-by: dt
 2010-07-06 18:36:32 +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
Bill King
c81ddf8ff9 Fix insufficient null checking. 2010-06-11 13:41:07 +10:00
dt
070f4df485 No need for special margin treatmeant anymore 
Remove unneded code.
 2010-05-25 13:48:10 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
dt
a60d55bdad Sort build & run configurations in the ui 
Implement a BuildConfigurationModel which does the sorting.
Extend the RunConfigurationModel to do sorting.

Make the mini target selector and project page use both of those models.

Task-Nr: QTCREATORBUG-1235
 2010-04-30 11:55:03 +02:00
dt
ee230f2d54 Fixes crash on adding configurations 
Reviewed-By: hunger
 2010-04-15 14:12:37 +02:00
dt
5c6007226f Fix crash on removing cloned buildconfigurations 
Reviewed-By: hunger
 2010-04-15 13:58:13 +02:00
Tobias Hunger
eca4c5aef0 Fix deletion of buildconfigurations 
Hitting the remove button to delete buildconfigurations
resulted in the wrong buildconfiguration getting removed.

Reviewed-by: dt
 2010-04-01 15:29:03 +02:00
dt
70dc75990f Simplfy code dealing with the projects page 
Distinguish between pages that are target specific and project specific.
Do the magic hierarchy reduction if only one target is supported just in
the projectwindow. Treat the targets page specially.

Reviewed-By: hunger
 2010-03-25 18:02:14 +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
dt
97d501de42 Switching buildconfiguration on the projects page now changes the active 
This is now possible due to the async evaluation
 2010-03-12 15:00:15 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
324f64b99f Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2010-02-24 16:44:50 +01:00
Friedemann Kleint
2acc96c8b8 tr()-Fixes. 2010-02-24 16:34:22 +01:00
con
cab971ae61 Project settings icons. 2010-02-23 17:00:50 +01:00
con
5f151d69e3 Add "make active" buttons, as replacement for the link. 2010-02-12 16:23:51 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support 
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
 2010-02-09 16:57:37 +01:00