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
dt
b9251a6626 Fix available QtVersion::availableToolchains
Do really disable the symbian emulator if there's no toolchain
supporting it.

Reviewed-By: hunger
2011-04-13 13:15:55 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
e3c59a5800 TargetSetupPage: Disable editing build directory for symbian
Shadow building is not supported so editing the path has no purpose.

Reviewed-By: hunger
2011-04-12 19:07:40 +02:00
dt
8839031e60 Maemo: Disable shadow building on windows again
Task-Nr: QTCREATORBUG-4255
Reviewed-By: Robert Loehning
2011-03-28 18:35:38 +02:00
Tobias Hunger
c6a74143b2 Fix project locations for symbian and maemo 2011-03-28 17:47:13 +02:00
dt
f5f134af38 MaemoTarget: fix compile fix 2011-03-24 14:29:44 +01:00
Friedemann Kleint
ca7c5c327f Windows compile. 2011-03-24 08:35:23 +01:00
dt
b45a73ffab Use unique build directories per qt version and debug/release
Reviewed-By: hunger
2011-03-23 15:27:02 +01:00
con
476223cdd6 Merge remote branch 'origin/2.2' 2011-03-11 09:26:43 +01:00
dt
ac28279efe TargetSetupPage: Only offer qt versions that have a toolchain
Task-Nr: QTCREATORBUG-3886
2011-03-10 17:56:57 +01: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
Friedemann Kleint
3bf818adc0 Qt4ProjectManager: Exported header cleanup. 2011-03-02 15:02:25 +01:00
dt
06ee3aee7f Qt4ProjectManager: New TargetSetupPage
Rewrite the target setup page to look and baheve better.
Noteable better at:
- Disabling shadow building
- Deselecting whole targets
- Adding import directories

Api-wise, Targets derived from Qt4BaseTarget have two ways to customize
the targetsetuppage.

a) Reimplement availableBuildConfigurations
b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget)
   in their default implementation. (Or only slightly customize like
   the desktop target does.)

Or:
a) Make a dummy implementation for availableBuildConfiguration
b) Replace createTargetSetupWidget and return your own widget
   (It should match the look and feel from the other widgets.)
   It needs to be derived from Qt4TargetSetupWidget
c) Also replace the create create(... Qt4TargetSetupWidget) function
   and set up the target anyway you want.
2011-02-22 15:35:24 +01:00
dt
672576e51e Qt4BaseTargetFactory: Introduce iconForId()
to be used on the new target setup page
2011-02-22 15:35:24 +01:00
Friedemann Kleint
7bd3bba6ee L10n: Tr-fixes for build configurations.
Remove duplicate code, proper messages, linguist comments.

Task-number: QTCREATORBUG-3821
2011-02-18 09:59:49 +01:00
Tobias Hunger
02a7bf505f Fix license headers 2011-02-17 17:53:52 +01:00
dt
b44d71b387 Fix available buildconfigurations for all cases 2011-02-15 15:22:13 +01:00
Friedemann Kleint
301f47733f Revert "Fix more issues with buildconfiguration creation"
Doesn't compile.

This reverts commit 2b65c731ba.
Reviewed-By: dt
2011-02-09 09:51:33 +01:00
dt
2b65c731ba Fix more issues with buildconfiguration creation 2011-02-08 19:18:59 +01:00
dt
d8c9fbddae Fix buildconfiguration creation for non buildall qts
Reviewed-By: hunger
2011-02-08 19:06:14 +01:00
Christian Kandeler
14cb9f91ad Make Meego target work.
- Package installation and running untested yet.
- User currently needs to adapt %files section in spec file manually.
  We expect this task to be automated by the build script in the future
  (see http://bugs.meego.com/show_bug.cgi?id=13148).
2011-02-01 14:08:12 +01:00
dt
35d95e3b17 Qt4ProjectManager: Do not offer invalid qt versions 2011-01-21 13:35:22 +01:00
Roberto Raggi
c238eb9300 Fixed unintialized variables. 2011-01-20 11:00:48 +01:00
Christian Kandeler
2ec85cc67a Maemo: Make some stateless functions static. 2011-01-19 11:07:14 +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