summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-gcce
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-4/+3
|\ | | | | | | | | | | | | | | | | 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
| * Correct some parameters for the makefile build sytem, armcc and gcceLiang Qi2011-04-071-4/+3
| | | | | | | | Reviewed-by: axis
| * Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | | | | | | | | | | | | Probably this was a result of backporting symbian-gcce support from 4.8 to 4.7. RevBy: Liang Qi
| * Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | | | | | | RevBy: Trust me
| * Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | | | | | | RevBy: Trust me
| * Unified the usage of $${EPOCROOT} for symbian.axis2011-03-041-8/+8
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen Conflicts: mkspecs/symbian-gcce/qmake.conf
| * Fix some build issues for building Qt for Symbian on Mac OS X.axis2011-02-211-1/+2
| | | | | | | | | | | | | | | | | | | | 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
| * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-183-0/+140
| | | | | | | | | | | | | | | | 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
* Update copyright year to 2011.Rohan McGovern2011-03-101-1/+1
| | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* Corrected a mismerge in GCCE link parameters.axis2011-02-241-1/+1
| | | | RevBy: Trust me
* Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-9/+9
|\ | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * Fixed GCCE libdir handling if the paths have spaces in them.axis2011-01-281-9/+9
| | | | | | | | RevBy: Trust me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | 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
* Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2010-11-181-4/+1
| | | | | | | 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
* Unified the usage of $${EPOCROOT} for symbian.Liang Qi2010-11-181-10/+10
| | | | RevBy: Miikka Heikkinen
* Merge remote branch 'scm/qt/master'Tor Arne Vestbø2010-10-281-1/+1
|\ | | | | | | | | Conflicts: mkspecs/symbian-gcce/qmake.conf
| * Fix some build issues for building Qt for Symbian on Mac OS X.Liang Qi2010-10-271-1/+2
| | | | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis
* | mkspecs: Emit warning when including g++.conf directlyTor Arne Vestbø2010-10-271-1/+2
|/ | | | | | | | | | | | 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>
* Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-213-0/+143
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