feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
5,895 Commits 108 Branches 368 Tags
4769ceb020c62f8c3eb95f9a15fe606dd57de848
Commit Graph

31 Commits

Author SHA1 Message Date
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
dt
99a7f927cc Add a window title to the Import existing build settings dialog 2009-10-27 18:11:24 +01: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
con
d500ceacf2 Add both "debug" and "release" build configurations, not only "release". 
Reviewed-by: dt
 2009-10-09 18:15:45 +02:00
dt
26aca40a92 Remove unused variable. 2009-10-06 17:15:41 +02:00
con
acbd4513e3 Changing string based api to BuildConfiguration based api. 
Builds, but I'm pretty sure it doesn't *work* :)
 2009-10-01 10:05:05 +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
6492101ea3 Fix importing adding a empty spec argument to qmake 2009-09-01 12:27:25 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
15471e6410 More import fixes and tweaks 
Don't add -spec foo to the additional Arguments if foo is the same as
the default mkspec. This makes the common case better, while breaking if
you have QMAKESPEC set in teh environment and used -spec foo to override
it.
 2009-07-24 18:12:19 +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
dt
406d853e2b Move the qmake config settign into qt4project. 
One less need for qmakestep.
 2009-07-21 14:50:54 +02:00
dt
61e7ffc9c7 toolChain() might return a null pointer 
Don't crash then
 2009-06-26 14:53:13 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Friedemann Kleint
5150089738 Fixed translation glitches. 2009-05-13 14:39:55 +02:00
Alessandro Portale
92c034b114 Don't annoy Windows users with alien dir separators 2009-04-29 14:12:31 +02:00
dt
2b302332b8 Move QtVersionManager, QtVersion and QtOptionsPage back 
After all I don't need all that stuff in the cmakeplugin, all i needed
is now bundled in debugginghelper.h/cpp
 2009-04-28 12:45:04 +02:00
dt
37e382b3bd Don't use the QtVersionManger::instance() where it isn't needed. 
Allows removing getting the instance once.
 2009-04-23 14:36:47 +02:00
dt
b6c05a334c Refactoring: Move QtVersionManager instance() into the ProjectExplorer 
And add a instance() method to it.
 2009-04-22 16:51:38 +02:00
dt
8f22417244 Refactoring: Move QtVersionManager to ProjectExplorer. 
The Debugger, cmake and Qt4 plugin all need it. More refactoring to it
coming.
 2009-04-22 14:52:35 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
dt
7283106134 Compile. 2009-04-01 11:48:11 +02:00
dt
154648385f Try harder to follow qmake's behaviour for debug_and_release 
That is we don't default to debug_and_release. We check the qt version
that is used for building, and if that one is not using
debug_and_release, we don't neither.
 2009-03-31 18:12:28 +02:00
Thorbjørn Lindeijer
71aeac5915 Use completeBaseName instead of baseName where appropriate 
Fixes issues with handling additional dots in the filename in many
places.

Task: 246390
 2009-03-20 17:04:23 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00