feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
13,975 Commits 108 Branches 368 Tags
f5c044fe48ac3b5cde9b43bf497bc2d42c7d51f6
Commit Graph

241 Commits

Author SHA1 Message Date
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
Oswald Buddenhagen
8fc775eb58 fix parsing of "-after" in qmake argument extractor 2010-09-17 12:34:14 +02:00
Friedemann Kleint
97e7c12e3c Code polishing, continuing cb23999fbf 
Add more error messages to processes run for toolchain detection.
Move Windows-specific code to dbgwinutils, remove inclusion of
<windows.h>. Fix MinGW gcc 4.5 warnings.
 2010-09-09 09:58:17 +02:00
Friedemann Kleint
cb23999fbf Add error handling to QProcesses run at startup. 
Give warnings about failures to be able to fix things/timeouts on
slow machines. Pass on arguments correctly on Windows.
Make sure processes are killed on timeouts.
 2010-09-08 15:22:58 +02:00
dt
95e666e740 Increase the timeout waiting for qmake to finish from 2 to 10 seconds. 2010-08-26 17:45:16 +02:00
Tobias Hunger
f3f6d642e5 Properly detect Qt versions of directories 
* Detection of Qt versions from a makefile failed on windows
   when calling qmake without the drive letter. Make this work.
 2010-08-24 18:28:52 +02:00
Tobias Hunger
4fc6393ff2 Fix indention 2010-08-24 18:28:52 +02:00
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