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

27 Commits

Author SHA1 Message Date
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
Christian Kandeler
439b45618e Start making the Maemo support more generic. 
This includes:
    - decoupling deploy configurations from targets (Reviewed-by: dt)
    - adding a "Generic Linux" device type
    - splitting up the Maemo deployment step into small pieces that
      can be combined in different ways (and much more easily maintained)
    - adding a new version handler for pro.user files
      (Reviewed-by: Tobias Hunger)

Also:
  - Add and use an SSH manager class for easier connection sharing.
  - Make the SSH connection parameters a fixed attribute of the connection.
 2011-03-09 13:10:19 +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
Christian Kandeler
f30c7f37f0 Maemo: Fix timer bug. 2011-01-13 16:27:55 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kandeler
e79f6031da Maemo: Prepare for possibility of our deploy step disappearing. 
Could happen e.g. when RDA is used.
 2011-01-11 16:56:05 +01:00
Tobias Hunger
b310a0fc0f Small fixes 2010-10-29 13:42:46 +02:00
dt
e4d8253473 Fix compile 2010-10-28 17:58:48 +02:00
dt
45dd1ad7f5 Disable Run Configurations while parsing .pro files 
Initial patch and idea by hunger.
Reviewed-By: hunger
 2010-10-28 16:09:41 +02: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
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
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
kh1
48a43475ec Remove warning. 
Reviewed-by: ck
 2010-09-29 13:39:09 +02:00
Christian Kandeler
6109738652 QML/Mobile wizards: Add target selection. 
Reviewed-by: Tobias Hunger
 2010-09-21 08:53:26 +02:00
Christian Kandeler
05b07bfe48 Maemo: Set Unix target mode for pro-file parsing. 
Reviewed-by: kh1
 2010-09-10 16:51:10 +02:00
Christian Kandeler
4387b47f92 Maemo: Fix deployables update after toolchain switch. 2010-08-26 11:49:44 +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
0cc983c801 Maemo: Use existing project files watcher. 
Also get rid of unneeded state.

Reviewed-by: kh1
 2010-07-26 17:32:29 +02:00
ck
8a3c1cc0d4 Maemo: Move INSTALLS information from package step to deploy step. 
... because the files are installed even when packaging is disabled.

Reviewed-by: kh1
 2010-07-14 12:22:30 +02:00
ck
9d7fc860bf Maemo: Add watcher for project files. 
Reviewed-by: kh1
 2010-07-08 12:19:02 +02:00
ck
70e801bb09 Maemo: Handle missing specification for remote executable. 
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