Commit Graph

169 Commits

Author SHA1 Message Date
Friedemann Kleint
f672bff338 Fix some code scanning issues.
foreach()-Loops.
2010-02-01 14:00:07 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
kh1
320ae1bfbc Make sure we add the toolchain only in case we have a valid madde.
Reviewed-by: ck
2010-01-21 12:08:21 +01:00
Tim Jenssen
01bcf0694b fixed addNewVersionsFromInstaller, if there is no TimeStamp in GlobalSettings
- if there is no LastQtVersionUpdate we doesn't have a real timestamp and we are not able to check against this.
 - this will happen during/after NDK installation

 Reviewed-by: Daniel Molkentin
2010-01-18 11:30:48 +01:00
Daniel Molkentin
45fb49ccdc Add timestamp for when to pick up new Qt versions.
This assumes that new Qt version entries will be put into
the System scope settings file.
2010-01-14 15:28:33 +01:00
dt
e3188417c3 Don't silently reset the qt version if it has become invalid
Instead note that it is invalid if trying to build and on the projects
mode pane.

Task-Nr: QTCREATORBUG-459
2010-01-12 15:51:11 +01:00
Tobias Hunger
592e494d1a Fix typos
Reviewed-by: thorbjorn
2010-01-11 10:26:13 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
con
6ca55f201f Provide a way for installers to prefill some more Qt parameters. 2009-12-17 18:50:49 +01:00
con
a54205c3a0 Mostly remove the special define for Symbian support.
The only part that is not done if not on Windows (or explicitly
specified) is the adding of the preference pane.
2009-12-17 18:01:41 +01:00
Erik Verbruggen
1a3aa6a9ce Changed help file discovery to include all qch files found. 2009-12-17 15:51:42 +01:00
con
7081a3d415 Merge remote branch 'origin/1.3'
Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp
2009-12-14 11:47:39 +01:00
con
8f586cedcd Couldn't set "/usr/bin/qmake-4.6" or "/Developer/Tools/Qt/qmake" for Qt.
Task-number: QTCREATORBUG-463
Reviewed-by: dt
2009-12-11 17:03:19 +01:00
dt
4ceab2bac5 Fix importing of configure generated Makefiles
Works now.
2009-12-10 19:13:51 +01:00
dt
c1816b248e Fix ugly bug found by Thorbjorn on removing/adding qt versions
Reviewed-By: Thorbjorn
2009-12-10 12:10:20 +01:00
Oswald Buddenhagen
f9d955eb6c cache parsed pri & prf files
no point in re-parsing them over and over during the scan of a bigger
project ...

shaves off another 20% of the loading time of Qt 4.6.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
ef660880ad make ProFileOption persist during the scan of an entire project
there is no point in throwing away and re-recreating invariant data over
and over ...

shaves off ~15% of the load time of Qt 4.6.
2009-12-08 17:36:41 +01:00
dt
1e46cb424e Rework connections on the project pane for Qt4Projects.
Should fix a lot of corner cases, might introduce a few bugs.
Also rename functions/slots to be better named.

Generic Project Manager and CMake Project Manager are missing from this
patch.
2009-12-07 15:00:17 +01:00
dt
651eb33823 Remove a unecessary QDir::toNativeSeparators()
Reviewed-by: Tobias Hunger <qt-info@nokia.com>
2009-11-19 17:46:04 +01:00
dt
6f0b4777d9 Merge commit 'origin/master' 2009-11-19 17:15:35 +01:00
Tobias Hunger
f09cb01f46 Make sure we export native directory separators.
* Export QTDIR and path to Qt binaries with native
   directory separators.

Reviewed-By: con
2009-11-19 16:50:58 +01:00
Tobias Hunger
1a5c8a1df7 Support symbian-sbsv2 mkspecs
* Handle SBSv2 by doing the same as for the older ABLD
   build system.

Reviewed-By: con
2009-11-19 16:37:13 +01:00
dt
0fa60aa3d8 Use QFlags<> for QmakeBuildConfig that removes a few casts. 2009-11-19 16:35:19 +01:00
dt
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
Friedemann Kleint
e35a754dc9 S60: Work towards new toolchains
Factor out the initialization setting up the environment and headers in
the RVCT/GCCE toolchains.
Modify the RunControl to be able to support different package
building/signing processes.
2009-11-13 15:47:35 +01:00
dt
5c14507506 Remove Debugging output 2009-11-11 18:48:53 +01:00
con
c7cd56c5d5 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-11-11 16:15:40 +01:00
con
43bccb41ed Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
2009-11-11 16:14:29 +01:00
dt
aa9329e738 More fixes for windows 2009-11-11 15:59:25 +01:00
dt
a6828ff92d Compile 2009-11-10 15:43:10 +01:00
dt
75e23cc58f Fix -spec handling 2009-11-10 13:29:13 +01:00
dt
4769ceb020 Fix crash 2009-11-10 13:29:13 +01:00
con
d8b2598f4f Symbian SDK path should be editable for Qt in PATH.
Reviewed-by: Robert Loehning
2009-11-09 14:19:58 +01:00
con
468b76fff2 Merge commit 'origin/1.3' 2009-11-05 19:00:23 +01:00
Friedemann Kleint
4ab3446ce0 Qt version tooltip: Display configuration correctly.
Reviewed-by: dt <qtc-committer@nokia.com>
2009-11-05 16:40:27 +01:00
con
c8bb7e174b Merge commit 'origin/1.3'
Conflicts:
	src/plugins/qt4projectmanager/qt4project.cpp
2009-11-04 19:15:14 +01:00
dt
655b06b48d Fix memory leak in QtVersionManager 2009-11-04 17:20:25 +01:00
dt
f84a144e01 Make the display for qws mkspecs nicer. 2009-11-02 17:36:29 +01:00
dt
835d522ac2 Don't pass QtVersion::mkspec() to the building of debugging helpers.
Instead simply pass -mkspec default, which has the same effect.
Fixes a bug with qws mkspecs
2009-11-02 17:25:10 +01:00
con
be3fafc311 Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5'
Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2009-10-29 18:54:17 +01:00
con
4fc6a17d94 Add setting for GCCE tool chain path. 2009-10-29 16:02:20 +01:00
dt
6e154b3055 Don't crash if the restored default version index is out of range 2009-10-29 14:09:24 +01:00
Robert Loehning
232b3c5bc3 Compile fix. 2009-10-28 19:03:18 +01:00
dt
943a091e82 Fix crash also in master. 2009-10-28 17:01:48 +01:00
dt
8b2c15013e Fix crash with no toolchain and clicking on build debugging helper 2009-10-28 16:58:05 +01:00
ck
ca8bb1e9ba QtVersion: Don't allow host gcc toolchain for Maemo Qt.
Reviewed-by: dt <qtc-committer@nokia.com>
2009-10-28 16:43:58 +01:00
con
68f193a189 Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
Needed changes:
        src/plugins/qt4projectmanager/qtversionmanager.cpp
2009-10-27 18:23:58 +01:00
Friedemann Kleint
33fedfea64 Qt4ProjectManager: Give a verbose tooltip on the Qt versions.
Reviewed-by: dt <qtc-committer@nokia.com>
2009-10-27 18:05:04 +01:00
con
7c12dad4a0 Make it possible to use non-autodetected Qt for Symbian.
Users can specify a S60 SDK root for Qt for Symbian versions
now.
2009-10-27 18:01:21 +01:00
Aaron McCarthy
1fb92cf87e Fix Windows CE SDK detection.
Assignments to CE_SDK in the mkspecs are not quoted, and is therefore
stored as a string list.  Recombine the string list back into a single
string before use.
2009-10-27 17:28:16 +10:00