feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,445 Commits 108 Branches 368 Tags
2ec85cc67a05b6227b65cd28f324745be61abfd7
Commit Graph

34 Commits

Author SHA1 Message Date
Christian Kandeler
d2a9631206 Maemo: Fix deployment signal handling. 2011-01-17 12:07:07 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kandeler
3cb34cf8ec Maemo: Move MADDE environment information out of MaemoToolChain class. 
The toolchain is not available in all places where we need the
respective information, which resulted in duplicated code.
 2011-01-04 14:15:57 +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
Christian Kandeler
397869c971 Maemo: Don't hold a reference to a run config in a run control. 
Save all relevant information at run control creation time, so we can
re-run even without a project.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=203698
 2010-11-11 12:10:36 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Christian Kandeler
64e47901b0 Maemo: Fix SFTP channel leak. 
Reviewed-by: dt
 2010-11-08 18:14:43 +01:00
Christian Kandeler
f2d14996ad Maemo: Add ports gatherer to deploy step. 2010-11-02 14:27:19 +01:00
Christian Kandeler
548df9385b Maemo: Use dynamic port list. 
Check whether the ports we need are actually available on the device.
As a side effect, this makes it possible to debug more than one
application at the same time on Maemo.

Task-number: QTCREATORBUG-2702
 2010-11-02 14:27:18 +01:00
Christian Kandeler
f900b90c46 Maemo: Introduce generic state checking. 2010-10-29 14:14:05 +02:00
Christian Kandeler
946cce3706 Maemo: Improve clean-up behaviour on remote hosts. 
We now remove files we have created on the device because they are
temporarily needed. This includes package files, mount points and pipes.

Task-number: QTCREATORBUG-2709
 2010-10-29 11:45:36 +02:00
Christian Kandeler
983bc5d248 Maemo: Only mention mounting stuff to user when it's actually done. 
Otherwise, we clutter the output window with potentially confusing
messages.

Reviewed-by: kh1
 2010-10-08 15:38:38 +02:00
Christian Kandeler
da7dd6181a Maemo: Make failed UTFS client upload non-fatal. 
The reason is almost always that another instance is still running,
which means the program is already there anyway.

Reviewed-by: kh1
Reviewed-by: dt
 2010-10-06 14:57:41 +02:00
Christian Kandeler
fad242c913 Maemo: Kill UTFS clients as well as UTFS servers in case of an error. 2010-10-01 16:20:18 +02:00
Christian Kandeler
97a56a627a Maemo: Fix UTFS timeout timer not being stopped in some cases. 2010-10-01 15:50:03 +02:00
Christian Kandeler
b4af592dc0 Maemo: Make states of remote mounter explicit. 
Reviewed-by: kh1
 2010-10-01 12:42:06 +02:00
Christian Kandeler
4923ca3f41 Maemo: Remove hardcoded user name. 
Reviewed-by: kh1
 2010-09-23 15:07:54 +02:00
Christian Kandeler
947f0f3a30 Maemo: source all relevant profiles and ignore non-existing ones. 
Reviewed-by: kh1
 2010-09-13 16:50:30 +02:00
Christian Kandeler
33f6981689 Maemo: Delay UTFS server start a bit. 
We have no way to know when the client is actually opening its ports,
so we wait until we are reasonably sure it's done.
This is not 100% safe, but should generally suffice.
(The UTFS server seems to have this logic already built in, but it does
not seem to work on Mac.)
 2010-08-26 11:49:44 +02:00
Christian Kandeler
a437f824c4 Maemo: Display UTFS server stderr output. 
This will help us diagnose errors.
 2010-08-26 11:49:44 +02:00
Christian Kandeler
14d7f6b661 Maemo: Toolchain for remote mounter needs to be dynamic. 2010-08-23 17:37:27 +02:00
Christian Kandeler
c0a922f742 Maemo: Differentiate between Maemo versions. 
Reviewed-by: kh1
 2010-08-23 17:37:27 +02:00
Christian Kandeler
6bf5f7340f Maemo: Deploy to sysroot. 2010-08-20 12:50:10 +02:00
Christian Kandeler
23c89c6ec2 Maemo: Saner approach to remote mounting. 2010-08-19 17:04:13 +02:00
Christian Kandeler
d1f0c171e2 Maemo: Fix UTFS server readiness detection. 2010-08-17 14:54:08 +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
qt-info@nokia.com
d8bdafd4d3 Maemo: Fix race condition in remote mounter. 
Wait until UTFS client has detached before starting the server.
 2010-08-12 19:25:15 +02:00
qt-info@nokia.com
76561b928c Maemo: Check whether UTFS server could actually connect. 2010-08-12 19:25:15 +02:00
ck
1ff13868dc Maemo: Add deployment via remote mount. 
Only tested on Linux, #ifdef'ed for now.
 2010-08-11 16:50:05 +02:00
ck
9d7021d42c Maemo: Progress report also for debugging. 2010-08-10 16:46:07 +02:00
ck
fcd4680761 Maemo: Improve progress reporting of remote process start and shutdown. 2010-08-10 16:11:06 +02:00
ck
1c746014af Maemo: Better reporting of mount errors. 2010-08-10 16:11:06 +02:00
ck
0b5e36d6fa Maemo: Encapsulate remote mount functionality in its own class. 2010-08-10 16:11:06 +02:00