| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| | |
| |
| |
| |
| |
| | |
foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network
Reviewed-by: Samuel
|
| | |
| |
| |
| |
| |
| |
| | |
The private class was already declared and defined in the qfileinfo.cpp
file.
Reviewed-by: thiago
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| | |
version from a Linux machine.
Reviewed-by: trustme
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When generating Windows Makefiles, qmake writes out a .rc file for each
of debug and release (unless you've limited to just one build type).
When doing a clean shadow build, the first .rc file is written into a
directory that does not exist but the code was not handling the error
case. The fix does 2 things.
1) Attempt to create the destination directory if we can't write the file.
2) Die with an error if we still can't write the file after doing #1.
Reviewed-by: Marius Storm-Olsen
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/painting/qtransform.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
In the function initCompilerTool we handled QMAKE_CXXFLAGS twice for
every configuration (debug / release).
The call of parseOptions before the if clause is enough.
Reviewed-by: mariusSO
|
| | |
| |
| |
| |
| | |
doesn't seem to be a terribly popular feature, given that nobody noticed
this yet ...
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tools/linguist/shared/profileevaluator.cpp
|
| | |
| |
| |
| |
| |
| |
| | |
Removed dead code and simplified conditionals. This should not otherwise
change behavior or output of qmake in any way.
Reviewed-by: mariusSO
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And some indentation fixes in qmake itself.
Fixes indentation; TRUE => true; FALSE => false; #includes and #defines
cleanup; removes dead code; comments... and somewhere along the way
marked a function static.
Reviewed-by: mariusSO
|
| | |
| |
| |
| |
| |
| |
| | |
When generating nmake makefiles, the same inference rules were
generated several times.
Reviewed-by: mariusSO
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | |
|
| |
|
