| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ...
|
| |
|
|
|