Commit Graph

404 Commits

Author SHA1 Message Date
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
dt
20767b79a4 This variable is only used on mac, so move it into the #ifdef block 2009-10-21 13:50:31 +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
ee92e82cb8 Fix bug with importanting a build with an not yet existing qt. 2009-10-06 17:16:18 +02:00
con
4252836b4d Fix windows build. 2009-10-01 10:05:06 +02:00
con
92b905a6f2 Build configuration factory now adds configurations directly.
It's easier this way for the unique naming.
2009-10-01 10:05:06 +02:00
con
fe313a9023 Configuration types for each Qt Version. 2009-10-01 10:05:06 +02:00
con
9b8503b0cd Fill the "Add" build configuration menu with values from factory.
Default creation type implementation are still missing for cmake and
generic projects.
2009-10-01 10:05:06 +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
dt
1d75ebecdc Fix Qt4Project::toolchain() returning a wrong thing.
Hmm even if the cached toolchain is correct, we do a few things, maybe
I should optimize it.
2009-09-23 17:39:50 +02:00
dt
fba7d76936 Canceling the wizard for a new cmake build configuration still created.
Made virtual newBuildConfiguration return a bool
2009-09-23 15:00:02 +02:00
dt
d8175992de Fixes a warning about a unused parameter 2009-09-17 16:06:19 +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
ead627ed81 Remove dependency of rvct toolchain and gcce toolchain on qt4project.
Also makes the code a lot smaller.
2009-09-03 16:07:14 +02:00
Thorbjørn Lindeijer
57bebee640 Use the theme background color for panel line edits
Previously, the image used as background forced it to be white, which
made the text impossible to read when the palette foreground color
happened to be white as well.

Task-number: 258167
2009-08-31 15:04:54 +02:00
dt
9f91842813 Compile without rtti support
Since we can easily do that, just do it. No gurantee that we aren't
going to use rtti in the future.
2009-08-27 12:12:35 +02:00
dt
b3ad912d7c Fix worngly aggregating all DEFINES from all .pro files. 2009-08-21 18:02:40 +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
dt
dbe5a6f34b Rework the project settings.
This has still a few missing things, but this enough to start getting
some feedback. Missing are non qt projects, a solution for the
runconfiguration, a missing black line between the treeview on top and
the project settings at the bottom. Some flickering with removing/adding
widgets to the QScrollArea and not showing the expanded widget if the
Details button is right at the bottom.
2009-08-06 15:31:32 +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
dt
7be8be2564 Fix wrong importing of old settings overwritting a release configuration 2009-08-05 11:41:37 +02:00
dt
26c903ce9b Fix for #Command not having a -spec argument. 2009-07-29 12:47:11 +02:00
dt
f35a0f5429 Some steps towards making qmakestep and makestep not mandotary.
Also fix a small bug with the import label.
2009-07-27 15:22:15 +02:00
dt
f1009fc63c Less debugging output 2009-07-24 18:52:44 +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
0d949c69bf Case insesitive for specs comparision for windows 2009-07-24 16:27:29 +02:00
dt
a79a26c7ae Move the function comparing settings and Makefile to Qt4Project
I need that in the Qt4ProjectConfigWidget to decide whether I should
show a import label.
2009-07-23 18:15:25 +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
ecfb6eaf5a Remove the qmakeStep() function from qt4Project 2009-07-21 15:01:16 +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
26ab24a669 Fix crash if we are adding a qtversion while still loading the project.
Only connect in restoreSettingsImpl() not in the constructor.
2009-07-17 17:25:48 +02:00
Thorbjørn Lindeijer
2fcf2ac5d3 Added a FakeVim color theme
Specially for FakeVim users out there who want an easy way to switch to
vim's default color theme on a dark brackground.

Also did a little cleanup.
2009-07-14 15:30:27 +02:00
con
67438b574a Delete toolchain in more intelligent way.
Create a new one and check if it's the same as the old one,
has the advantage that cached data doesn't need to be retrieved again.
It was that way before tool chain was moved to Qt4Project.
2009-07-14 15:30:03 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED
There were both variants, with and without extra semicolon.
2009-07-13 17:35:17 +02:00
Oswald Buddenhagen
edeb93d6fa micro-optimization 2009-07-10 14:04:48 +02:00
dt
e524f52477 Allow restoreSettings() to fail,
E.g. cmake pops up a wizard then, the running of cmake can fail though.
Now you don't end i[ with a empty project then. The error reporting in
that case is not yet optimal.
2009-07-03 16:46:01 +02:00
Roberto Raggi
319720f43a Don't add $QT_INSTALL_HEADERS/Qt to the include paths.
Indexing both /include/Qt and /include/{QtCore,QtGui,...} makes the code completion with fedora.
2009-06-26 16:36:04 +02:00
dt
61e7ffc9c7 toolChain() might return a null pointer
Don't crash then
2009-06-26 14:53:13 +02:00
Friedemann Kleint
44d8b28a9f Fix crash after importing a Qt 4 project.
Reviewed-by: dt <qtc-committer@nokia.com>
2009-06-25 12:10:30 +02:00
con
8fd395feb4 Update the enabled state of run configurations on toolchain change.
And if Qt version changed.
2009-06-24 13:41:50 +02:00
con
936ba4c070 Make target information update also for non-Qt4RunConfigurations
Transform the method in Qt4Project into a signal that is handled
by the run configurations themselves.
2009-06-24 13:41:49 +02:00
con
f3eb79b198 Remove the project parameter to ToolChain::defaultMakeTarget again. 2009-06-24 13:41:49 +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
7b04fc45e8 Make it possible to actually select a tool chain. 2009-06-24 13:41:41 +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
655a1c9198 Create a wingcce toolchain. 2009-06-24 13:41:38 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00