feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
5,974 Commits 108 Branches 368 Tags
43bccb41ed789f17d8baf92901ba687553c44ddb
Commit Graph

141 Commits

Author SHA1 Message Date
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
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
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