Commit Graph

241 Commits

Author SHA1 Message Date
Robert Loehning
1ded9ce798 Compile fix. 2010-03-15 17:03:11 +01:00
dt
7215c03369 Check for existince of the QMAKESPEC_ORIGINAL directory
Some mkspecs do have a QMAKESPEC_ORIGINAL and yet that directory doesn't
exist. In that case ignore it.

Task-Nr: QTCREATORBUG-586
2010-03-15 16:23:50 +01:00
dt
16ff6ac772 Fix QtVersion to not run qmake on constructing
Only if we need the information.
2010-03-15 11:55:00 +01:00
dt
ab8fc52d0b Use exact and aysnc .pro file evaluate
This is a big change touching almost all of our .pro file parsing.
With this patch we only evaluate once exact for all needs and once
greedy for the filelist. That is the qt runconfigurations don't have own
evaluaters but reuse the project wide exact evaluation.

We reevaluate if the user changes the build directory, the qmake
buildconfiguration or the qmake arguments. That is if you open src.pro
(or projects.pro) of qt with a shadow build you still don't get all the
files, but after correcting the build directory, we reevaluate the .pro
files and find all files. So for a suitable definition of fixed, that
bug is now fixed.

We now get the exact defines of all .pro files instead of all defines for all
buildconfigurations. We still don't distinguish in which
.pro file a DEFINE is set. So the code model now knows about all the
defines set for the given configuration but not for which files it is
actually set. Also that includes all DEFINES set in .qmake.cache or the
mkspecs. This means all defines from .pro files should now work.

The intial loading is still synchronous. I haven't looked into it to
deeply, but it seems possible to make it also async.There are probably a
few issues which need to be solved fist.

Also due to the asynchronous nature of the code, the executable is
updated a few seconds after actually changing the build configuration
2010-03-10 17:02:24 +01:00
ck
3e29ede56d Maemo: Detect more arm architectures.
Reviewed-by: kh1
2010-03-05 13:04:48 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
c0a68f53c3 Tr()-fixes. 2010-02-26 14:20:17 +01:00
Tobias Hunger
07d025603c Remove Maemo emulator
* kh1 says there is no such thing as there is no technical
   destinction between Maemo devices and the Maemo emulator.

Reviewed-by: kh1
2010-02-26 14:16:42 +01:00
Friedemann Kleint
28820807a1 Tr()-Fixes 2010-02-25 10:34:25 +01:00
kh1
69ebf668ba Return a reference to the object, changed from pointer.
Since we use addAutoReleasedObject we would rather unclean call the
class destructor.
2010-02-23 18:16:14 +01:00
Tobias Hunger
ea007592bc Qt versions are different if the dislayname does not match
* Fixes update of Qt version name whne renaming a Qt version.
2010-02-22 18:23:14 +01:00
Tobias Hunger
ee0c5d3129 Do not report qmake pathes if the file is no longer there
* We get a bogus Qt imported otherwise
2010-02-19 11:41:34 +01:00
Friedemann Kleint
7c9c99dcf0 Symbian/Linux: Enable building with makefile-based system.
- Autodetect SDK by environment variable EPOCROOT and qt directory
below.
- Environment::appendOrSet/prependOrSet: Avoid duplicate entries
- Rename toolchain enumeration value
- Adapt S60ToolChainMixin to new GnuPoc setup, provide routines for
  all required variables.
- RVCTToolChain: Make RVCT detection smarter (Check for RVCT<v1><v2>BIN
  variable). Set all required variables in case of RVCTToolChain/GnuPoc
- QtVersionManager: Detect toolchain and Qt version properly, make S60
  device run config accept toolchain.
- Modify S60DeviceRunControl to execute 'make sis'
- Modify S60Devices::detectQt...() to check for Qt installed into SDK
  first and symlink as fallback.
2010-02-17 17:38:48 +01:00
dt
3c99f02bcb Rename QMake to qmake since that's the official spelling. 2010-02-17 16:54:50 +01:00
Tobias Hunger
53cfd44537 Unify slashes we get when parsing mkspec files on windows 2010-02-12 13:55:22 +01:00
con
e5d3e04c60 Also handle EPOCROOT and default device settings for Symbian devs. 2010-02-12 11:57:30 +01:00
Tobias Hunger
c93e96305f Make target detection not depend on toolkit 2010-02-11 18:04:22 +01:00
Tobias Hunger
8548da1c30 Assume the GCCE toolchain to be always available in Symbian
* This is necessary as the decission on whether Symbian support
   is available at all depends on the ToolChain used to build.
   We should improve this!
2010-02-10 12:21:25 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
ck
a40a3d84d5 Maemo: Enable compilation unconditionally. 2010-02-08 17:52:56 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues.
QString: Use QChar/char where appropriate, do not use QString::null
2010-02-02 17:09:41 +01:00
kh1
e94ff514ed Move HelpManager it's own source files.
Reviewed-by: ck
2010-02-02 14:27:11 +01:00
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