Commit Graph

234 Commits

Author SHA1 Message Date
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
2010-08-23 16:00:24 +02:00
Kai Koehne
60fffda9eb QmlProject: Search for qmlviewer in configured Qt versions (if not found in $PATH)
If no 'qmlviewer' executable is found in the PATH, iterate through the
list of configured Qt versions and try to find a qmlviewer there. This
should help users configuring creator such to play with Qml.

Right now the first qmlviewer found in a Qt version is selected. A UI
to let the user select one explicitly was not possible any more (string
freeze).

This requires a dependency from QmlProjectManager to
Qt4ProjectManager.

Reviewed-by: dt
2010-08-19 17:22:13 +02:00
Tobias Hunger
5b72808192 Reuse existing string for new "builddir.level != sourdir.level" warning
* Revert this once string freeze is over!
2010-08-19 16:11:10 +02:00
Tobias Hunger
423686c0a9 Report project issues in the Project Mode window
* Add test for build- and sourcedirectories being at different levels

Reviewed-by: dt
2010-08-19 15:09:26 +02:00
Tobias Hunger
2430059345 Replace tab with spaces 2010-08-17 12:52:42 +02:00
Tobias Hunger
b797ccaa3e Add function to find out whether sbsv2 is used
* Add function to check whether the new symbian build system is used
   to build a Qt version. This will be used to decide which parsers
   to use when building for symbian
2010-08-11 15:41:52 +02:00
Oswald Buddenhagen
04bee3be57 change the way how loading of configs & features is controlled
make it an argument of the main entry point instead of a property
2010-06-24 18:57:50 +02:00
Oswald Buddenhagen
704deac4e2 micro-optimize: allocate ProFileEvaluator on the stack 2010-06-18 21:26:38 +02:00
Oswald Buddenhagen
192759cb9a use a ProFileParser+ProFileEvaluator instead of a ProFileReader
the latter does too much
2010-06-18 21:23:09 +02:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
2010-06-11 16:30:39 +02:00
kh1
1b6ad08795 Move help manager into core.
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
2010-06-11 13:11:37 +02:00
Tobias Hunger
7f58e0e8a3 Improve detection of simulator Qts
* Make this more reliable and faster using less code.

Reviewed-by: dt
2010-06-10 15:21:34 +02:00
dt
69bd2df4e4 Fix QMAKE_CXX parsing
Task-Nr: QTCREATORBUG-1411
2010-05-27 16:36:26 +02:00
Daniel Molkentin
5784e2ad86 prefer adding Qt versions shipping with QML examples
Reviewed-by: dt
2010-05-25 19:23:28 +02:00
kh1
e9d1841552 Make sure we can compile the debugging help for maemo.
This boils down to the same problem as other calls to qmake, if we don't
pass the target mode, qmake will prepend the current platform as target.
Reviewed-by: dt
2010-05-21 14:43:18 +02:00
dt
5193cef369 Remove dead code 2010-05-18 17:40:34 +02:00
dt
3cc8f2f9e0 Fix check for g++ 2010-05-18 17:40:34 +02:00
dt
cf57bda96f Maemo does support shadow building 2010-05-12 16:50:37 +02:00
Tobias Hunger
78989998d5 Mark simulator as a mobile target 2010-04-30 14:27:51 +02:00
Tobias Hunger
69100c353c Add a special target for Qt simulator 2010-04-30 14:27:50 +02:00
Friedemann Kleint
010b73615c i18n: tr()-fixes. 2010-04-27 12:39:00 +02:00
dt
0b5ffee800 Remove debugging output 2010-04-26 12:30:00 +02:00
con
451418138b Hide building debug helper UI in cases where it's not supported.
Reviewed-by: Alessandro Portale
2010-04-23 13:25:37 +02:00
Friedemann Kleint
9d2ca0e8cf MSVC: Try to determine version if none is set.
Try to find matching version for mkspec.
Rubber-stamped-by: Joerg Bornemann <qtc-committer@nokia.com>
2010-04-21 17:24:37 +02:00
Tobias Hunger
6473ab730c Add method to QtVersion to query it for issues
Reviewed-by: dt
2010-04-20 15:21:17 +02:00
Tobias Hunger
5a97f79e0b Handle qmake with or without trailing .exe
Handle qmake with or without trailing .exe on windows. Looks like the
extension got lost recently in the generated Makefiles.

Reviewed-by: dt
2010-04-14 17:46:49 +02:00
Tobias Hunger
772c838aa3 Add a method to find pro-files used to create a Makefile
Reviewed-by: dt
2010-04-13 13:43:08 +02:00
dt
3de0668894 Linux icc parser
Reviewed-By: hunger
2010-04-12 15:05:11 +02:00
Tobias Hunger
c5b5127be2 Disable shadow building when appropriate
Reviewed-by: dt
2010-04-08 18:15:16 +02:00
Tobias Hunger
e89c4775fa Allow loading of projects even with no valid Qt
This patch marks up invalid Qt versions as Desktop.

Make sure we add a the always existing invalid Qt version in the path
available in the targetselectionpage if no valid Qt versions could be found.

This way a project can be set up and loaded without a valid Qt version set up.
Trying to build this will fail of course. This is basically how we handled
this situation before we had targets, too.

Task-number: QTCREATORBUG-1066
Reviewed-by: dt
2010-04-08 16:18:14 +02:00
dt
9ddd7a59d7 Revert "Progress so far"
This reverts commit b1a121c54f.

Accidentally pushed the linux icc parser before it was ready.

Conflicts:

	src/plugins/qt4projectmanager/qtversionmanager.cpp
2010-04-08 10:49:20 +02:00
dt
340ca7f8d8 Treat embedded g++ toolchains as desktop g++ toolchains.
That means wrong target (though argueable we don't have a correct one
yet, but working defines and includes.
2010-04-07 14:58:22 +02:00
dt
b1a121c54f Progress so far 2010-04-07 13:51:07 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02:00
Tobias Hunger
f11a25801a Add option to query QtVersion for mobile support 2010-03-30 16:55:29 +02:00
Tobias Hunger
4c5ce80141 Add method to retreive valid Qt versions only 2010-03-26 13:15:31 +01:00
Thorbjørn Lindeijer
5e68c2afb8 Don't create Welcome mode pages when there is no Welcome mode
Fixes creating these pages unnecessarily when the Welcome plugin is not
loaded, as well as "leaking" them in that case.

Reviewed-by: con
2010-03-22 13:13:33 +01:00
dt
0f7b746486 Fix debugging helper logic 2010-03-19 17:53:14 +01:00
dt
5058233bdd Fix crash on loading projects 2010-03-18 15:36:04 +01:00
dt
8b7eacc19f Treat a set QMAKEFEATURES correctly
We used to ignore if someone had set a additional for his qmake, with
qmake -set QMAKEFEATURES. The fix is a simple oneliner from Filip
Piechocki. See qt-creator merge request 130.

Task-Nr: QTCREATORBUG-805
2010-03-18 12:49:23 +01:00
Friedemann Kleint
0535eb09b9 Compile fix (Qt4Projectmanager). 2010-03-17 08:20:27 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
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