| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: ossi
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
instead of glueing the commands with "&&" and having a monster hack
(\r\h) for the case where they cannot be and-ed, glue them with newlines
and error checks. this ensures that we a) never have excessively long
lines, b) don't need the monster hack and c) commands always have proper
error checks, just like in makefiles.
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13080
Reviewed-by: Martin Petersson
|
| |
| |
| |
| | |
Rubber-stamped-by: ossi
|
| |
| |
| |
| | |
Rubber-stamped-by: ossi
|
| |
| |
| |
| | |
Rubber-stamped-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Removal of the following variables:
MSVCPROJ_VERSION, MSVCPROJ_PROJECT, MSVCPROJ_TEMPLATE, MSVCPROJ_CONSOLE,
MSVCPROJ_WINCONDEF, MSVCPROJ_VCPROJTYPE and MSVCPROJ_SUBSYSTEM.
Apart from MSVCPROJ_WINCONDEF none of these variables were in use.
MSVCPROJ_WINCONDEF was used to add the _WINDOWS define if CONFIG
contained "windows". The _CONSOLE define was never added.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| | |
VS2010 does not support Windows CE.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| | |
This generator is VS2010 only.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| | |
This is already done by MSVCPROJ_WINCONDEF.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| | |
This already happens in initConfiguration.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| | |
This is already done in qt.prf.
Reviewed-by: ossi
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
win32/thread.prf takes care of handling the following variables:
MAKE_CXXFLAGS_MT_DLLDBG
MAKE_CXXFLAGS_MT_DBG
MAKE_CXXFLAGS_MT_DLL
MAKE_CXXFLAGS_MT
No need to do that in the MSVC generators.
It was incorrectly implemented anyway.
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
|
|
| |
The previous patch caused the pch header to be compiled without exception
handling since the compilertool for the pch compilation do not get
its options filled from the compiler flags.
This patch instead set the value to off before calling parseOptions.
This also reverts commit 73fa311f67b21c9b897de0196d3b8227f27d828f.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
|
| |
Adding the post-build step to copy the dll into bin
Reviewed-By: Thierry
|
|
|
|
|
|
|
|
| |
The variables QMAKE_LFLAGS_DEBUG, QMAKE_LFLAGS_RELEASE,
QMAKE_CXXFLAGS_DEBUG and QMAKE_CXXFLAGS_RELEASE are handled by .prf
files in mkspecs/features and don't need to be evaluated by generators.
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
| |
We don't have to evaluate QMAKE_FLAGS_CONSOLE or QMAKE_LFLAGS_WINDOWS.
These files do it for us:
mkspecs/features/win32/console.prf
mkspecs/features/win32/windows.prf
Reviewed-by: andy
|
|
|
|
|
|
|
| |
We don't have to evaluate QMAKE_CXX_FLAGS_WARN_ON / ..._OFF
mkspecs/features/warn_on.prf / ..._off.prf do it for us.
Reviewed-by: andy
|
|
Reviewed-by: Marius SO
|