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

45 Commits

Author SHA1 Message Date
Christian Kandeler
ad5bd745ef Maemo: Revert 2.1 patch. 
We have a proper fix for 2.2.
 2011-01-13 15:03:58 +01:00
con
f46a87a6f5 Merge remote branch 'origin/2.1' 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
 2011-01-12 10:20:46 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kandeler
fc31b812c9 Maemo: Optionally remove packaging data on target removal. 
Task-number: QTCREATORBUG-2996
 2011-01-11 16:56:05 +01:00
Christian Kandeler
549022b55f Maemo: Tell file manager not to bother the user with expected updates. 2011-01-10 12:14:30 +01:00
Christian Kandeler
ffd1de7c8b Maemo: Add hint to Debian rules file. 
Task-number: QTCREATORBUG-3228
 2011-01-06 14:22:39 +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
1764fda40b Maemo: Fix detection of valid icon in publishing code. 
Task-number: QTCREATORBUG-3342
 2010-12-16 18:05:22 +01:00
Christian Kandeler
0d02c49cdc Maemo: Add GUI element to set project description. 2010-12-08 11:21:40 +01:00
Christian Kandeler
6aa00e7d95 Maemo: Manage project's display name for package manager. 
Task-number: QTCREATORBUG-3063
 2010-12-07 18:31:33 +01:00
Christian Kandeler
084a51fb98 Maemo: Check some meta information before publishing. 2010-12-07 18:31:33 +01:00
Christian Kandeler
7fd0b2dbb6 Maemo: Fix code redundancy. 
Recursively removing a directory was implmented twice.
 2010-11-26 12:20:18 +01:00
Christian Kandeler
667d645611 Maemo: By default, strip release binaries. 
But never strip debug binaries.

Task-number: QTCREATORBUG-2981
 2010-11-02 16:17:41 +01:00
Christian Kandeler
fe72f7c2f9 Maemo: Have only one MaemoDeployables object per Maemo target. 
It does not depend on any of the settings in the deploy configuration.

Task-number: QTCREATORBUG-2678
 2010-10-27 10:53:57 +02:00
Christian Kandeler
9137c376e0 Maemo: Don't monopolize the debian directory. 
Using a debian directory in the project root directory might interfere
with non-MADDE configurations.
We therefore introduce an extra directory qtc_packaging, where we can
safely put our stuff. In the future, this should also contain
non-Fremantle (and possibly non-Debian) configurations.

Reviewed-by: Oswald Buddenhagen
 2010-10-18 17:47:10 +02:00
Christian Kandeler
af8b262ece Maemo: Don't create a deployment widget per sub project. 
This makes use of a Maemo target perform acceptably for big projects.

Task-number: QTCREATORBUG-2703
Reviewed-by: kh1
 2010-10-14 14:06:54 +02:00
Christian Kandeler
3772fd3510 Maemo: Don't add debian files to project file. 
We should change the contents of existing files as little as possible.

Task-number: QTCREATORBUG-2647
Reviewed-by: kh1
 2010-10-13 11:44:19 +02:00
Christian Kandeler
9b4d72ad64 Maemo: Fix possible crash due to removed project file node. 
We must not save a Qt4ProFileNode in our MaemoDeployableListModel,
since it might no longer exist when we use it again.

Reviewed-by: kh1
 2010-10-11 16:45:24 +02:00
Christian Kandeler
d23afc8e61 Maemo: Don't create desktop files, ask before updating project files. 
Also don't waste performance by repeatedly reacting to the same
project file change.
This is relevant for bigger projects to which a Maemo target might
have been added by mistake.

Task-number: QTCREATORBUG-2647
Reviewed-by: kh1
 2010-10-11 15:43:00 +02:00
Christian Kandeler
20f796ee62 Maemo: Fix deployment of inactive project. 
Reviewed-by: kh1
 2010-10-04 16:46:14 +02:00
Christian Kandeler
17ce6be56a Maemo: Be more tolerant in case of missing tool chain. 
(cherry picked from commit ca8b342a17)
 2010-09-28 09:19:52 +02:00
Friedemann Kleint
d207c8cdcb L10n: tr()-fixes, message strings, compiler warnings. 
Rename 'QML standalone application' to 'QML application'
and the 'old-style' QML applications to
'QML Viewer based applications'.

For the QML renaming:
Rubber-stamped-by: Alessandro Portale <alessandro.portale@nokia.com>
 2010-09-15 15:16:13 +02:00
Christian Kandeler
ff7ef5edda Maemo: Get rid of maemo6 reference, fix deploy paths. 2010-09-09 10:37:42 +02:00
Christian Kandeler
0fe26e80c5 Maemo: Add default icon name to desktop file. 2010-08-30 17:58:36 +02:00
Christian Kandeler
cb11e601d3 Maemo: Remove version specification from Debian Build-Depends field. 2010-08-30 17:58:36 +02:00
Christian Kandeler
b74eb892c6 Maemo: Partly revert 8fe7ac8940. 
This is needed for sourve packages, but interferes with binary ones.
 2010-08-30 17:58:36 +02:00
Christian Kandeler
f1676515bb Maemo: Add Qt dependency to debian/control. 2010-08-27 16:00:23 +02:00
Christian Kandeler
8fe7ac8940 Maemo: Adapt Debian files. 
- Set priority to "optional", as recommended for Maemo.
- Fix rules file so it can be used for source packages.
 2010-08-27 13:41:03 +02:00
Christian Kandeler
87a6db0990 Maemo: Lose one level of packaging directory structure. 
We will now behave friendlier to projects that already have a
debian directory. Also, building a source package will be more
straightforward.

Reviewed-by: kh1
 2010-08-27 12:40:03 +02:00
Christian Kandeler
7b276878b1 Maemo: If we create a desktop file, we should also deploy it. 
Reviewed-by: kh1
 2010-08-23 17:37:28 +02:00
Christian Kandeler
6bbc55369a Maemo: Adapt to OVI store requirements. 
Reviewed-by: kh1
 2010-08-23 17:37:27 +02:00
Christian Kandeler
4d691377f3 Maemo: Don't strip binaries by default. 
Otherwise, we couldn't sensibly use the device's gdb for debugging.
 2010-08-19 17:37:49 +02:00
ck
acdbe05feb Maemo: Put desktop files into the respective sub projects. 2010-08-09 11:51:05 +02:00
ck
925182ffab Maemo: Create .desktop files for all application (sub-)projects. 2010-08-06 17:32:14 +02:00
ck
875b425da1 Maemo: Warn about problematic project name and try to work around it. 
Reviewed-by: kh1
 2010-08-06 13:32:19 +02:00
ck
9b338fbbe4 Maemo: Don't forget non-active projects in template manager. 
Reviewed-by: kh1
 2010-08-05 15:09:48 +02:00
ck
6c009f19cd Maemo: No packaging file watchers for non-Maemo projects. 2010-08-05 11:35:07 +02:00
ck
9d712dee79 Maemo: Let user choose package manager icon. 
Reviewed-by: kh1
 2010-08-05 11:35:07 +02:00
ck
50f30655e2 Maemo: Watch Debian files and update packaging GUI accordingly. 
Reviewed-by: kh1
 2010-08-04 16:39:30 +02:00
ck
28247894bd Maemo: Let user edit Debian files via the packaging widget. 
This will give an additional hint to users that they can and should
adapt the Debian template files.

Reviewed-by: kh1
 2010-08-04 15:39:09 +02:00
Roberto Raggi
0c2e8834f5 Compile on mac. 2010-08-03 18:14:24 +02:00
ck
8f3c5467fe Maemo: Add packaging template files to project. 
Reviewed-by: kh1
 2010-08-03 17:21:04 +02:00
ck
1bcdb33fb1 Maemo: Create packaging templates in project directory. 
Reviewed-by: kh1
 2010-08-03 16:29:23 +02:00