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

44 Commits

Author SHA1 Message Date
Tobias Hunger
4f146f6587 Use Core::FileChangeBlocker 
Remove class that does something similar.

Reviewed-by: Christian Kandeler
Change-Id: I7acfa119cf18d96c22d1873a464b1c004c78e132
 2011-05-06 15:16:43 +02:00
Christian Kandeler
6b5ce26bf6 Maemo: Adapt list of deployables for "aux" project. 2011-05-05 17:44:27 +02:00
Christian Kandeler
12b2a5fff0 Maemo: Harmattan application icons are now 80x80 pixels big. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=250237
 2011-04-29 09:45:35 +02:00
Christian Kandeler
0ee99ff2b3 Maemo: Move OsVersion type from MaemoGlobal to MaemoDeviceConfig. 
Also move freePorts() method from AbstractMaemoDeployStep
to MaemoGlobal.
 2011-04-21 14:42:17 +02:00
Oswald Buddenhagen
2be153ba37 unify i/o error reporting in the model 
- use Utils::FileSaver
- as a side effect, don't rewrite the desktop file with the same content
  if it already exists
- pop up message boxes on errors - this is likely to be more visible
  than qWarning()s/nothing
  - this is implemented in a somewhat strange way with the model itself
    doing the gui interaction, but that seems to be the simplest
    solution given the qt class design
 2011-04-18 14:10:15 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christian Kandeler
08aaad92ac Maemo: Fix default deployment paths. 
Applications must live in /opt/<project name> on Harmattan & Meego.

Reviewed-by: Alessandro Portale
 2011-02-08 18:09:06 +01:00
Christian Kandeler
f0a54abf6b Maemo: Introduce dedicated Fremantle and Harmattan targets. 
Task-number: QTCREATORBUG-2770
 2011-01-18 15:22:12 +01: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
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
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
278730ddd0 Maemo: Fix path to exectuable in desktop file when publishing. 2010-12-07 15:23:08 +01:00
dt
0bde4a133d Maemosupport: small correctness fix 
return 0 not false in case of an error

Reviewed-By: Christian Kandeler
 2010-12-06 11:01:17 +01:00
Christian Kandeler
7a5c004763 Maemo: Change installation prefix for non-Fremantle systems. 
- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.
 2010-12-01 16:56:51 +01:00
Christian Kandeler
5466766819 Maemo: Only add target deployment for the current toolchain. 
Task-number: QTCREATORBUG-3222
 2010-11-30 18:10:40 +01:00
Christian Kandeler
233081aadb Maemo: Move .pro file scope generation to a dedicated function. 2010-11-30 17:57:23 +01:00
Christian Kandeler
f8979403ce Maemo: Fix Harmattan icon workaround. 
Don't hardcode PNG format.
 2010-11-26 10:38:25 +01:00
Christian Kandeler
218978a74a Maemo: Small deployment refactoring. 2010-11-26 10:38:25 +01:00
Christian Kandeler
da115606fa Maemo: Allow adding an application launcher icon via the GUI. 
Reviewed-by: kh1
 2010-11-25 17:59:15 +01:00
Christian Kandeler
66ea47e33a Maemo: Don't interpret plugins as static libraries in deployment view. 
Reviewed-by: Thorbjørn Lindeijer
 2010-11-08 14:11:30 +01:00
Christian Kandeler
dbd3965241 Maemo: Remove additional parsing step. 
Instead, utilize the newly added INSTALLS information of Qt4ProFileNode.

Task-number: QTCREATORBUG-2679
 2010-10-28 09:25:18 +02:00
Christian Kandeler
62d5cae082 Maemo: Implement on-demand adding of desktop files. 
Task-number: QTCREATORBUG-2704
 2010-10-25 15:23:19 +02:00
Christian Kandeler
ee53546d8e Maemo: Allow user to add target.path if project does not have it. 
Task-number: QTCREATORBUG-2704
 2010-10-22 13:29:38 +02:00
Christian Kandeler
fee3802e15 Maemo: Show native separators in deployment view. 
Reviewed-by: kh1
 2010-10-14 14:06:54 +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
c5e743e6c9 Maemo: Bugfix: Use TargetInformation::workingDir in all cases. 
We currently use buildDir in one place and workingDir in another,
which breaks projects that have DESTDIR set.

Reviewed-by: Tobias Hunger
 2010-10-08 15:38:38 +02:00
Christian Kandeler
ff7ef5edda Maemo: Get rid of maemo6 reference, fix deploy paths. 2010-09-09 10:37:42 +02:00
Christian Kandeler
aef9d15eba Maemo: Silence incompetent compiler. 2010-09-08 17:54:02 +02:00
Christian Kandeler
6bbc55369a Maemo: Adapt to OVI store requirements. 
Reviewed-by: kh1
 2010-08-23 17:37:27 +02:00
Christian Kandeler
4220fade22 Maemo: Change default deploy directory prefix. 
Also set build directory for profile reader.
 2010-08-19 14:40:41 +02:00
ck
3d6f264290 Maemo: Add newline before appending to project file. 
Otherwise, if the project file does not already end in a newline,
we'd introduce syntax errors.
 2010-08-16 17:08:48 +02:00
ck
6878198a23 Maemo: Clean up the local executable path some more. 
Needed for constructs such as "TARGET=../xxx".
 2010-08-09 16:43:48 +02:00
ck
e7a8cad1ea Maemo: Expand wildcards for deployment information. 
Reviewed-by: kh1
 2010-08-06 17:32:14 +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
ck
11d0951924 Maemo: Fix ProFileOption settings, write INSTALLS in maemo scope. 
Task-number: QTCREATORBUG-1951
Reviewed-by: kh1
 2010-07-27 17:28:23 +02:00
ck
fc17ac2f9e Maemo: Make deployables widget read-only. 
We don't have the API to sensibly support writing tot he project file.

Reviewed-by: kh1
 2010-07-08 13:53:04 +02:00
ck
9d7fc860bf Maemo: Add watcher for project files. 
Reviewed-by: kh1
 2010-07-08 12:19:02 +02:00
ck
68beb601f3 Maemo: Use qmake configuration from sysroot. 
Also allow absolute file paths for deployables.

Reviewed-by: kh1
 2010-07-07 16:50:19 +02:00
ck
608fcf3123 Maemo: Correctly deploy subdirs projects. 
Task-number: QTCREATORBUG-1614, QTCREATORBUG-1810
Reviewed-by: kh1
 2010-07-07 14:51:46 +02:00
ck
f43095ceaf Maemo: Prepare infrastructure for proper subdirs support. 
No difference in functionality yet.

Reviewed-by: kh1
 2010-07-06 12:06:03 +02:00