Commit Graph

172 Commits

Author SHA1 Message Date
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
kh1
efa44fa5c1 Return <default> if we can't find out the mkspec name. Overwrite mkspec
in case one has set MAKESPEC but does not actually pass it as argument.

Reviewed-by: dt
2009-10-26 15:57:30 +01:00
ck
11706165a2 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2009-10-26 15:53:33 +01:00
con
441ece365a Merge commit 'origin/1.3'
Conflicts:
	src/plugins/cpptools/cppcodecompletion.h
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qmleditor/QmlEditor.pluginspec
2009-10-26 13:51:56 +01:00
ck
0edf1b48a6 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2009-10-23 09:41:14 +02:00
dt
8a9d4315e6 Fix crash by sharing ownership of the toolchains in qtversion 2009-10-22 17:09:28 +02:00
ck
7df5226e42 Fixes Maemo after Toolchain refactoring
Reviewed-by: dt <qtc-committer@nokia.com>
2009-10-22 16:27:47 +02:00
dt
cfc7040ede The qtversions's toolchain now depends on the actual compiler not mkspec
That is we actually parse the mkspec and evaluate QMAKE_CXX (and a few
other variables) to figure out the correct mkspec. This makes using
custom mkspecs easier and is also cleaner. I also changed mkspec() and
mkspecPath() to behave a little diffrent, essentialy mkspec() will
return only the name (the actual dir name) of the mkspec. That is in
general not sufficient for passing on to qmake. mkspecPath() only
returns the correct path to mkspecs/default.
Hopefully I haven't broken WinCE/Maemo/MinGW.
2009-10-22 14:39:00 +02:00
Daniel Molkentin
381a9480bf Fix detection of Qt Versions added by installer.
Now that we check for the qmake.exe location rather than for
the path itself, we need to use QFile for the check.
2009-10-22 14:24:15 +02:00
ck
6a49395e33 Add experimental Maemo support.
Includes Maemo tool chain, run configuration, run control,
manager, etc.

Adds the DebuggerManager to the object pool. This is ugly, but
nobody came up with anything better on short notice. To be
refactored.

Co-Authored-By: kh1
2009-10-16 18:01:07 +02:00
ck
18a383848a Add braces.
More diff reduction ...
2009-10-16 18:01:07 +02:00
con
9a0896802d Missing bookkeeping when removing Qt Versions.
Reviewed-by: dt
2009-10-12 15:31:20 +02:00
dt
671f1b2215 Ensure that the qmake path is without backslashes 2009-10-06 18:34:44 +02:00
dt
ee92e82cb8 Fix bug with importanting a build with an not yet existing qt. 2009-10-06 17:16:18 +02:00
dt
2b613d6f89 Fix id creation 2009-10-01 18:59:54 +02:00
dt
2160436d67 Remove debugging output. 2009-10-01 18:59:44 +02:00
dt
f04cd91c6b Simplyfy the DebuggingHelper functions.
By only providing a qtInstallDir variant
2009-09-17 15:55:08 +02:00
con
65284dc0ed Oops. Compile again. 2009-09-10 18:07:51 +02:00
con
7b596180bb Missing return statement. 2009-09-10 17:58:00 +02:00
Daniel Molkentin
e2c06d5da1 Make conversion to from QTDIR to qmake more reliable. 2009-09-04 09:52:14 +02:00
dt
53cfbb13a7 Initialize everything also in the invalid QtVersion ctor. 2009-09-03 19:45:09 +02:00
Daniel Molkentin
5476bcf560 Find Qt installation by specification of qmake rather than a "Qt dir".
Rationale: The concept of a "Qt Dir" is dead ever since Qt can be
installed. Specifying the qmake location otoh makes it possible to
unambigously detect all parts of a Qt installation.
2009-09-03 19:16:40 +02:00
dt
3aec72c4e1 Wrong path comparision making resulting in unecessary qmake runs 2009-08-27 15:08:47 +02:00
con
85cdc9b402 Show the "real" name of the default version in build settings.
Reviewed-by: dt
2009-08-26 15:57:57 +02:00
dt
74602f3119 Remove debugging output, running qmake works for most people. 2009-08-17 11:52:29 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Friedemann Kleint
1729c2c0c2 Debugger: Improve the helper build mechanism on the settings page.
- Give the controls a tooltip listing file details (date)
- Make building a QtConcurrent task
- Make log window scroll to bottom and pop up on error
- Make the build code pass on error messages about copying the
  source files to the log file
- Clean up the building code string-wise, use QLatin1String and
  translate messages, cache the icons. Use a QSharedPointer for
  the QtVersions in the settings page since they are passed to
  the BuildTask, which may outlive the dialog.
2009-08-07 15:20:05 +02:00
Friedemann Kleint
2841e875b4 Revert "Debugger: Improve the helper build mechanism on the settings page."
This reverts commit debb3961c2.
Success cannot be properly detected.
2009-08-07 14:20:27 +02:00
Friedemann Kleint
debb3961c2 Debugger: Improve the helper build mechanism on the settings page.
- Give the controls a tooltip listing file details (date)
- Make building a QtConcurrent task
- Make log window scroll to bottom and pop up on error
- Make the build code pass on error messages about copying the
  source files to the log file
- Clean up the building code string-wise, use QLatin1String and
  translate messages, cache the icons
2009-08-07 14:10:36 +02:00
dt
1010ea5251 Fix another spec not equal bug, squash another case where qmake was run. 2009-08-06 18:49:10 +02:00
con
fe92b40f45 Start on rvct support.
It works, except that the code model doesn't get the rvct include
directories and defines yet. And you need to have everything for
rvct set up in your environment.
2009-08-05 17:08:15 +02:00
Oswald Buddenhagen
2a4ef827a9 inject QT_VERSION into the evaluator
almost too simple to be right, given the TODO ...
2009-08-04 20:59:28 +02:00
dt
027a19841d Make the debugging output less and better. 2009-07-29 12:47:10 +02:00
Daniel Molkentin
5633de2ac9 Make the welcome screen into plugins.
This removes the all hard dependencies to and from welcome screen,
except the one to the core plugin. More in detail:

- Add IWelcomePage to add a tab to the welcome screen
- Move tabs in the modules where they belong
- Enables QHelpManager to open help fullscreen and contextually
- "Getting Started" moves to Qt4ProjectManager
- Projects & Sessions (aka "Develop") moves to ProjectExplorer
- "Community" remains in the welcome plugin for simplicity
2009-07-28 16:11:55 +02:00
con
80705c163f Find examples also with shadow built Qt developer build.
Reviewed-by: Daniel Molkentin
2009-07-27 12:28:59 +02:00
dt
ae63443715 On windows the #Command line is escaped with quotes 2009-07-23 14:00:45 +02:00
dt
f1dfb3c6ce Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-07-22 19:18:09 +02:00
dt
cd27fdecd9 Parse the Makefile in the importing case a lot better
We add each command line argument to the Additional Arguments
2009-07-22 16:52:44 +02:00
Daniel Molkentin
f8f0c4ce44 Move Welcome Page to separate plugin. 2009-07-21 13:58:27 +02:00
Daniel Molkentin
6446b87992 Update Example information not only when the default Qt version changed.
It may be that a non-default Qt version provides documentation even if
the default one does not.

Fixes: 257970
2009-07-20 14:26:17 +02:00
dt
54bbcc4a7c Mention possible locations of the debugging helper in the error dialog
Requires a lot of trivial forwarding.
2009-07-15 17:41:45 +02:00
con
151366dffa isQt64Bit is a better name.
Since that method actually checks if Qt is built 64bit,
not if MSVC is 64bit.
2009-07-14 15:30:04 +02:00
con
a9d05dab62 Move tool chain object from Qt version to project. 2009-06-24 13:41:48 +02:00
con
66c2c7c18b Add the environment from the right tool chain.
Since the actual tool chain is defined in the project, it
moved there from the qt version.
2009-06-24 13:41:42 +02:00
con
a3a7c27d5d Make QtVersion's toolchain variable.
QtVersion provides possible toolchains that can be used by the
Qt version, e.g. winscw, gcce and armv5 for symbian-abld.
2009-06-24 13:41:39 +02:00
con
7bec2253c9 gcce toolchain needs default make target dependent on debug/release.
Passing the Project to the tool chain now. Not quite sure if I like it.
2009-06-24 13:41:38 +02:00
con
6b3ef9f818 Parametrize metroworks tools path. 2009-06-24 13:41:37 +02:00
con
02fb12d74d Add toolchain for WinScw, and be able to compile for winscw udeb. 2009-06-24 13:41:32 +02:00