Commit Graph

345 Commits

Author SHA1 Message Date
con
e92988261e Merge remote branch 'origin/2.2' 2011-04-20 11:07:25 +02:00
Kai Koehne
f86c9b6572 QmlDump: Ensure that qmldump is found in QtSDK
We ship a precompiled qmldump in the Qt SDK because the Qt versions
don't have private headers. However, the logic in buildablehelperlibrary
by default rejects any build that is older than the latest changes to the
qmldump source code files; allow Qt Creator to pick up the (maybe
outdated) qmldump nevertheless if no private headers are installed.

Reviewed-by: ckamm
Task-number: QTCREATORBUG-4578
2011-04-18 15:38:03 +02:00
Oswald Buddenhagen
2f1993e499 don't re-implement QDir::canonicalFilePath() by hand 2011-04-18 14:10:12 +02:00
con
5b02bf94a8 Merge remote branch 'origin/2.2'
Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2011-04-18 13:57:07 +02:00
dt
e0c568f275 QtVersionManager: Detect changes in sbs/system root settings
Otherwise the Qt options dialog won't emit a signal if just those paths
are changed in the settings.

Reviewed-By: hunger
2011-04-15 14:17:38 +02:00
Tobias Hunger
c7c9238259 Fix upgrade of Symbian Qt versions from 2.1
SBSv2 support has changed a bit.

Reviewed-by: Pawel Polanski
2011-04-14 15:41:11 +02:00
Tobias Hunger
7328bce8a6 Set debugger when importing tool chains from old settings
Set the default debugger when importing tool chains from old
settings. We just left the field blank before.

Task-number: QTCREATORBUG-4482
Reviewed-by: dt
2011-04-14 15:41:10 +02:00
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
Tobias Hunger
17c5ac54ca Symbian: Always export SBS_HOME when building with SBSv2
Always export SBS_HOME when building with SBSv2, even though that
is no longer required. Not doing so breaks Qt 4.6.3 support in the
SDK for some people.

Task-number: QTCREATORBUG-4487
Reviewed-by: Robert Loehning
2011-04-13 17:00:26 +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
Tobias Hunger
c5178bfb01 Tool chain: Find QtCore on Mac
Find QtCore library on mac when not in a framework.

Task-number: QTCREATOR-4452
Reviewed-by: con
2011-04-11 13:39:37 +02:00
Tobias Hunger
6a2490c381 Symbian: Be more clever about figuring out SBS path 2011-04-08 10:44:02 +02:00
Bill King
5e372a165f Merge branch '2.2'
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
2011-04-05 16:43:24 +02:00
Tobias Hunger
ff75133381 Qt: Make sure to import non-native pathes from ini
Make sure to not import non-native pathes from our settings
(from old versions of Qt Creator). We make sure to use only
proper slashes nowadays.

Task-number: QTCREATORBUG-4328
Reviewed-by: dt
2011-04-01 17:26:20 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
2011-04-01 09:53:09 +02:00
Tobias Hunger
f8d7be70bc Fix update from GCCE and WINSCW set in Qt version
Fix the upgrade from GCCE and WINSCW from Qt version to
tool chain.

Task-number: QTCREATORBUG-4204
Reviewed-by: dt
2011-03-30 16:04:51 +02:00
Christian Kandeler
03e5c10a4a Disable shadow builds on Windows for Fremantle and Harmattan as well.
Addendum to 8839031e60.
2011-03-30 15:03:55 +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
07f269f27c Fix typo 2011-03-28 16:42:03 +02:00
Friedemann Kleint
866e39a0a2 Target dialog: Set a tooltip containing Qt version info.
Introduce verbose flag and display QtVersion tooltip on
checkbox.

Reviewed-by: dt
2011-03-22 12:44:29 +01:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
dt
8a180f71df Qt4ProjectManager: Small refactoring in reportIssues
Do not report project dir specific issues next to each
buildconfiguration. Also move the code to a place the TargetSetupPage
can easily use, without having a hardcoded target list. Note: They
currently aren't shown at all, next step is to show them once per
target.

Reviewed-By: hunger
2011-03-16 17:28:21 +01:00
dt
ffc8be6c88 QtVersionManager: Mark some more qt versions as invalid
Namely versions not having a correct sysroot and where qmake is non
executable. Remove those from reportIssues as they are then already
covered by the isValid() check.

Reviewed-By: hunger
2011-03-16 17:28:21 +01:00
Tobias Hunger
9b1da76ca7 QTVersion: Reset toolchain pathes on creator upgrade
Reset the toolchain pathes on creator upgrade. This is necessary
to prevent creator from auto-creating the toolchains found by
reading the settings in the old Qt version configuration which
might override user changes.
2011-03-15 17:35:51 +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
Tobias Hunger
75f819848f Symbian: Remove S60devices
Remove S60devices and all the code surrounding it. This gets rid of
the S60 devices tab in the options dialog, too.

Tasknumber: QTCREATORBUG-3681
Reviewed-by: dt
2011-03-10 16:04:42 +01:00
Tobias Hunger
de4b2244f1 Quieten warning when Qt version is not found 2011-03-07 17:56:06 +01:00
Tobias Hunger
b5e79e352c Report failures to find ABIs of Qt versions
Give a reason why the Qt version is not valid when we were not
able to detect the ABIs used by the Qt version.
2011-03-03 17:02:48 +01:00
Tobias Hunger
cb7cca793a Detect ABIs of static libs 2011-03-03 16:35:04 +01:00
con
4de8eadaac Fix static Qt detection.
We want the absolute path of the file info, not the file name relative
to the pwd.

Reviewed-by: Tobias Hunger
2011-03-02 15:59:30 +01:00
Tobias Hunger
c9f7d779a6 Handle static Qt libraries on mac 2011-03-02 15:12:21 +01:00
Tobias Hunger
a87a8e71f9 Do not check for .la files when looking for QtCore 2011-03-02 14:31:06 +01:00
Tobias Hunger
586d1440be Also detect QtCore when located next to qmake 2011-03-02 12:26:33 +01:00
Friedemann Kleint
ad21b4859a L10n: tr()-Fixes. 2011-03-01 17:07:37 +01:00
Friedemann Kleint
562265d58c Toolchains: Header cleanup. 2011-02-28 16:50:14 +01:00
Friedemann Kleint
87423acca8 Polish target/toolchain warnings a bit. 2011-02-28 12:29:41 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
Tobias Hunger
4792715f20 Symbian: Allow for EPOCROOT and project to be on different drives
Allow for EPOCROOT and the project to be on different drives when
using SBSv2.

Task-number: QTCREATORBUG-3781
2011-02-24 17:54:09 +01:00
Kai Koehne
4b49d4f74c QtVersion: Rename 'debuggingHelper' to 'gdbDebuggingHelper'
Avoid confusion with other debugging helpers.
2011-02-24 13:45:39 +01:00
Kai Koehne
8b5f742fdf Qt Options Page: Remove gdb debugging helper status from tooltip
Listening all debugging helpers there is overkill, and one can see
their status conveniently anyway if the Qt version is selected.
2011-02-24 13:45:39 +01:00
Kai Koehne
d90d6729ad QtVersionManager: Small debugging output fix 2011-02-24 09:14:32 +01:00
Robert Loehning
4fc0839b37 Compile fixes 2011-02-23 19:10:09 +01:00
hjk
a8ae618d75 toolchain: fix enum naming style
Reviewed-By: Tobias Hunger
2011-02-23 17:56:33 +01:00
Tobias Hunger
3f4517f67f Qt: Detect Qt versions build with libinfix 2011-02-23 11:26:43 +01:00
dt
4440a3b726 QtVersionNumber: Fix crash
Checking the string for validity is not enough, actually bailing out if
it is invalid is better...
2011-02-22 17:36:10 +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
a9963b6313 QtVersionManager: Introduce qtVersionNumber + various fixes
Make the internal data structure a map from id to Version, simplfing a few
functions. Return sorted lists, with newer versions in front for various
functions, e.g. validVersions(), versionsForTargetId.
2011-02-22 15:35:23 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
2011-02-21 18:33:23 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
2011-02-18 12:57:45 +01:00