| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
in parallel.
On Windows, when a project has a lot of INCLUDEPATHs, some extra logic
takes place to work around an issue of large command lines.
Instead of passing all the paths directly to moc.exe, the paths are
written to mocinclude.tmp which is then read from by moc.exe.
Prior to this change, every moc rule tries to write to mocinclude.tmp.
When running make with -j, this will happen in parallel, causing this
error message:
"The process cannot access the file because it is being used by another
process"
Change the logic so mocinclude.tmp is generated by its own rule.
Reviewed-by: Lincoln Ramsay
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
append the source dir to the include path, but only after the dirs with
the generated files.
this seems to have worked before only accidentally: the unqualified
default dirs were expanded to the source dir instead of the build dir,
but the build dir is added implicitly by default, so things magically
worked. now that we qualify the moc/ui dirs, projects relying on the
strange side effect suddenly break.
we should probably add the source dir to the include path by default,
but this coupling to uic/moc is closer to the historical behavior and
thus should be safer.
Reviewed-by: mariusSO
|
| |
|
|
| |
sometimes, even two reviews are not enough ...
|
| |
|
|
|
|
|
| |
this time, it can deal with directories which are absolute to start
with.
Reviewed-by: mariusSO
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7d2c8eb99c563b4fb236fe538123255f52f293a2.
This commit was not reviewed and breaks compile of QtNetwork on win32
with this error...
src\network\kernel\qauthenticator.cpp(55) : fatal error C1083: Cannot
open include file: '../3rdparty/des/des.cpp': No such file or
directory
... because the generated Makefile no longer contains src/network
as an include path.
|
| |
|
|
| |
This reverts commit 3aff9113a9702ea6f7e099a73136a718ae1b992f.
|
| |
|
|
|
|
|
|
|
| |
uic is set in default_pre. this leads to useless -I compiler flags when
no ui files are used in fact, so it would be nice to get rid of it in
cases where it is not used. for backwards compat, don't remove it from
the _pre, but add some magic to _post to remove it again if QT does not
contain gui. of course, we need a force_uic CONFIG to enable an
exception for QtGui itself ...
|
| | |
|
| |
|
