feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

93 Commits

Author SHA1 Message Date
hjk
61700c16e1 projectexplorer: s/IPropertiesPanel/PropertiesPanel. No need for subclassing. 2011-04-14 13:32:30 +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
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
1bdaf934e0 Add a full name to DoubleTabWidget 
The fullname is used if the name is not unique

Task-Nr: QTCREATORBUG-2113

Reviewed-By: con

Squash
 2011-03-30 12:03:01 +02:00
dt
67cfb7e078 Qt4projectManager: Refactor Qt4Target, split up in per target classes 
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.

(*) Noteable missing is the qtversion, which needs to be split up
per target too.

Also fixes
Task-Nr: QTCREATORBUG-2440

Reviewed-By: hunger
Reviewed-By: ck
 2011-01-17 14:13:40 +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
Friedemann Kleint
22f03cbde6 ProjectExplor/Debugger: Header cleanup 2010-11-02 16:14:00 +01:00
con
89e66d7042 Fix annoying behavior that target selector always switched back to "build" 
Reviewed-by: Tobias Hunger
Task-number: QTCREATORBUG-1877
 2010-10-08 13:48:45 +02:00
dt
55856dd100 Fix crash after unloading project and changing qt versions 
Unloading a project must always remove the configuration widgets, since
otherwise they might be accessed after the project was deleted. So
remove them even if we have no other project widget to show.

Reviewed-By: Tobias Hunger
 2010-08-26 18:48:05 +02:00
Friedemann Kleint
e8c0d0c162 Yet another include purging spree. 2010-07-13 16:36:37 +02:00
Tobias Hunger
443d5d3dc6 Make sure to initialize a variable 
... otherwise the ASSERT will not trigger when it should.
 2010-06-18 13:34:35 +02:00
dt
070f4df485 No need for special margin treatmeant anymore 
Remove unneded code.
 2010-05-25 13:48:10 +02:00
con
ca14299790 Rename IPlugin::shutdown --> IPlugin::aboutToShutdown 
Discussed-with: hjk
 2010-04-28 17:32:01 +02:00
dt
94d6b23da1 Fix crash if the startup project changes to 0 2010-03-26 11:01:47 +01: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
184fd353d2 Synchronize startup project and current project on projects mode 2010-03-25 17:37:23 +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
Tobias Hunger
dceda9db70 Refresh ProjectMode when supported targets change 
Reviewed-by: con
 2010-03-15 13:55:11 +01:00
Jens Bache-Wiig
1ed2874b4c Remove redundant projects label 
As discussed with nigel, this label doesnt really make sense.
It is confusing because you might thing you should click it
and tab widgets do not usually require labels to indicate that
you should press them.
 2010-03-12 12:12:31 +01:00
Jens Bache-Wiig
42ebc6b0f2 Redesigned the project settings page 
I redesigned the gradient boxes for a
more subtle an professional look.
 2010-03-11 10:56:20 +01:00
Jens Bache-Wiig
f593b0d685 Polish for the build page 
I added a sidebar as suggested in the ergosign
screenshots. It is required to balance things.
 2010-03-11 10:56:19 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
c47b3812e4 Sort projects alphabetically in projects mode 
Reviewed-by: con
 2010-03-05 10:40:24 +01:00
con
cab971ae61 Project settings icons. 2010-02-23 17:00:50 +01:00
Tobias Hunger
d8016ef8aa Disable Project Mode if no projects are loaded 2010-02-22 18:07:21 +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
con
cfd998490b New project mode layout, first part. 2010-01-22 15:34:01 +01:00
dt
28aa2d54f5 change RunConfiguration::addedRunConfiguration() removedRunConfiguration() 
To simply transmit the RunConfiguration

Reviewed-By: Tobias Hunger
 2010-01-20 18:21:10 +01:00
dt
bfb06191bf Propageate BC::displayNameChanged() to BuildConfigurationComboBox 
Fixes one of the missing updates. More to come.
 2010-01-08 13:47:51 +01:00
dt
52d07a9b57 BuildConfigurations know their project, these signals can be simpler 2010-01-08 13:47:51 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Tobias Hunger
c311ab0a4f Reduce flickering in project mode 
* Remove one layer of layout.

Reviewed-by: dt
 2009-12-09 13:01:09 +01:00
Tobias Hunger
50bd482496 Set width of projects mode to 900px. 
We are targetting nothing below netbooks. These devices have screens
 that usually are 1024px wide (or wider), so this increase should be OK
 there.

 The 100px bonus do help a bit when editing environment variables, etc.

Reviewed-by: dt
 2009-12-07 15:24:57 +01:00
dt
fe71ca8a55 Fix connect 2009-12-07 15:00:17 +01:00
dt
57ba6b09fc Fix active configuration combobox 2009-12-02 17:51:57 +01:00
Tobias Hunger
b583c3d4ed Fix connect that got broken during rebase. 
* Fix two connects I broke earlier while doing a rebase.

Reviewed-by: Roberto Raggi
 2009-12-01 15:11:40 +01:00
Tobias Hunger
7ebf60dce2 ProjectWindow update 
* Indent widgets using contentsmargins. That way the individual
   widgets can override this.
 * Remove spme spacers in favour of yet more contents margins.
 * Remove unused headers and forward declarations.
 * Define some constants for spacings we might want to tweak later on.

Reviewed-by: dt
 2009-12-01 13:45:19 +01:00
dt
675e0b2e52 Disable connects that currently don't work 2009-11-30 15:24:32 +01:00
dt
7904544b84 Remove BuildConfiguration::name() 
The pointers can be used to distinguish BuildConfigurations
 2009-11-30 15:24:31 +01:00
Tobias Hunger
a37592a16f Update project mode page. 
* Change layout of project mode page.

Reviewed-By: dt
 2009-11-25 16:02:47 +01:00
Tobias Hunger
426890b790 Change PropertiesPanel interface. 
* Rename it to IPropertiesPanel in accordance with new naming standards.
 * Do not derive from Context. That is not needed.
 * Add an icon() method.
 * Fix all usages of this interface.

Reviewed-By: dt
 2009-11-25 16:02:47 +01:00
Tobias Hunger
fbcd670854 Improve memory management in project window. 
* Panel struct does no longer take ownership of its widget.
 * Panels consitently delete their widget in their destructor.

Reviewed-By: dt
 2009-11-25 15:18:51 +01:00
Tobias Hunger
97ad692684 Move line drawing class to the top of the file. 
* This way it becomes available to all classes in this file.

Reviewed-By: dt
 2009-11-25 15:12:34 +01:00
dt
0fa60aa3d8 Use QFlags<> for QmakeBuildConfig that removes a few casts. 2009-11-19 16:35:19 +01:00
dt
0d648636fa The code never did anything anyway, also the disconnect is not necessary 
Since the runconfiguration gets deleted anyway.
 2009-11-19 16:35:19 +01:00
dt
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
dt
83016e47fe Fix leaking PropertiesPanels 2009-11-04 19:32:49 +01:00
dt
a562a379e2 Show a no project loaded on the project pane if no project is loaded 
Could be even nicer, but this works for now.
 2009-10-07 15:46:07 +02:00