| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is
used.
Reviewed-by: mariusSO
|
|
|
|
|
|
|
|
| |
avoids warnings with qmake -Wall about overriding the variable (as
typically both scripts are in CONFIG, but only one is actually used).
Task-number: QTBUG-13911
Reviewed-by: mariusSO
|
|
|
|
|
|
|
|
|
|
| |
The option is on when building Qt, but off by default for other
projects, due to potential incompatible compile options in other
projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor
directive)
Reviewed-by: bhughes
Reviewed-by: ossi
|
|
|
|
|
|
|
| |
put each step into a separate make command.
that makes for cleaner output and less troubles with command separators.
Reviewed-by: mariusSO
|
|
|
|
| |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the function provides a cross-platform way to determine the exact
pathname of our build tools (moc, etc.).
use it in our .prf files, so we don't have to rely on qmake's
unreliable path separator normalization magic in extra compiler
commands, which broke on mingw+sh in silent mode.
remove the bootstrap tool path setting from configure, as it is
redundant now.
Reviewed-by: joerg
Task-number: QTBUG-10633
|
| |
| |
| |
| |
| | |
Merge-request: 2374
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| | |
Reviewed-by: Martin Petersson
|
|/
|
|
|
|
|
| |
- win32-msvc.net/qplatformdefs.h was included from msvc2003. inline it.
- purge references to msvc.net from feature files
Reviewed-by: mariusSO
|
|
|
|
|
| |
Task-number: QTBUG-5148
Reviewed-by: Tom Cooksey
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| | |
The configuration option was not added to the Windows configure.
Reviewed-by: hjk
|
| |
| |
| |
| |
| |
| |
| | |
ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags
on the link line if it is needed by the OpenVG engine.
Reviewed-by: trustme
|
|/
|
|
|
| |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
|
|
|
|
|
|
|
| |
If OBJECTS_DIR was empty then it would create a directory for the
manifest files in the root directory. This is not desired as it should
create a directory in the build directory instead.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Turning on LTCG affected too many projects, where customers applications
would take a long time linking, severly affecting their development time
(even though it was only added for release builds)
We turn it off by default, and add a -ltcg configuration option, and the
possibility to also do CONFIG+=ltcg in projects, should they not want it
for Qt, but in their own projects. (Same, they can build Qt with it, and
do CONFIG-=ltcg for their project)
Reviewed-by: andy
|
|
|