| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| |
| |
| |
| | |
Reviewed-by: axis
|
| |
| |
| |
| |
| |
| |
| | |
Probably this was a result of backporting symbian-gcce support from
4.8 to 4.7.
RevBy: Liang Qi
|
| |
| |
| |
| | |
RevBy: Trust me
|
| |
| |
| |
| | |
RevBy: Trust me
|
| |
| |
| |
| |
| |
| |
| |
| | |
RevBy: Miikka Heikkinen
Conflicts:
mkspecs/symbian-gcce/qmake.conf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927.
RevBy: axis
Conflicts:
mkspecs/symbian-gcce/qmake.conf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was done for a number of reasons:
- In order to get better consistency with the other mkspecs, which
have the target system name followed by a hyphen and the compiler
name.
- There is no real reason why we should have specific mkspecs for
compiling Symbian under Linux, when it is equally likely to work
under other operating systems.
RevBy: Thomas Zander
Conflicts:
src/s60main/s60main.pro
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|
|
|
| |
RevBy: Trust me
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| |
| |
| |
| | |
RevBy: Trust me
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
|
|
|
|
|
|
| |
Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion.
Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf.
RevBy: Miikka Heikkinen
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/symbian-gcce/qmake.conf
|
| |
| |
| |
| |
| |
| | |
Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927.
RevBy: axis
|
|/
|
|
|
|
|
|
|
|
|
|
| |
86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people
with their own mkspec who would still include g++.conf directly. We now
print a warning if this situation is detected, and explain to the user
how they can fix their mkspec.
For convenience we redirect g++.conf to g++-unix.conf so that people's
mkspecs will still work.
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
|
|
This was done for a number of reasons:
- In order to get better consistency with the other mkspecs, which
have the target system name followed by a hyphen and the compiler
name.
- There is no real reason why we should have specific mkspecs for
compiling Symbian under Linux, when it is equally likely to work
under other operating systems.
RevBy: Thomas Zander
|