Commit Graph

14 Commits

Author SHA1 Message Date
Christian Kandeler
205268fb15 Maemo: Fix some qemu button behavior glitches. 2011-01-19 12:41:52 +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
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Christian Kandeler
20e749df08 Maemo: Move "mad info" parsing for Qemu specs into dedicated classes. 2010-11-30 15:32:02 +01:00
Christian Kandeler
0f15f41966 Maemo: Move MaemoQemuRuntime class to its own file. 2010-11-30 15:32:02 +01:00
Christian Kandeler
9a26654878 Maemo: Rename "Runtime" class to make the name more unique. 2010-11-30 15:32:02 +01:00
Christian Kandeler
ede779e3c7 Maemo: Support new "mad info" schema.
Reviewed-by: kh1
2010-11-30 13:45:33 +01:00
kh1
a81e33258e Speedup project loading, we now parse only the targets runtime info.
Reviewed-by: ck
2010-10-11 11:05:53 +02:00
Christian Kandeler
2546a42a15 Maemo: Fix Qemu libpath parsing.
There can now be more than one variable be set.

Reviewed-by: kh1
2010-09-23 15:07:54 +02:00
kh1
1cb071728f Watch the runtime folders, so we can update the starter once added.
Reviewed-by: ck
2010-08-18 16:34:19 +02:00
ck
378ad4de3d Maemo: Device configurations now have a list of free ports.
The device configuration widget is now the only place the user
ever has to specify ports.
2010-08-13 16:19:21 +02:00
ck
5ff0d9b72f Maemo: Rename some classes.
All our classes should have the Maemo prefix because we don't have
a namespace of our own.
2010-07-28 09:36:30 +02:00