summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-182-1/+3
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Workaround for compiler error with MWCC (Symbian emulator) Describe patch-capabilities in the install instructions. Remove qmake warning by using appropriate variable. Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory called "platform".
| | * Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has ↵Norbert Leser2010-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed /epoc32/include layout, including a subdirectory called "platform". Since that particular directory is used as test for detecting SDKs with "New SF structure", the test returns with false result in case of pf_5250 (which has old SF structure). Change was made to test for a more obscure directory "mw" that appears the be present in new structure only. Merge-request: 2281 Signed-off-by: axis <qt-info@nokia.com>
| * | Adding texture glyph cache default.Adrian Constantin2010-01-151-0/+2
| |/ | | | | | | | | | | | | | | In maemo mkspec added the definition QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024. When sgx fix will be delivered remove from maemo mkspec that definition. Reviewed-by: Stefano Pironato Reviewed-by: Tom Cooksey
* | Merge branch '4.6'Thiago Macieira2010-01-13129-130/+128
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Attempt at readding the capital P headers for PhononThiago Macieira2010-01-061-0/+1
| |
| * Remove special Phonon processing from syncqt.Thiago Macieira2010-01-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | Restore original Qt 4.4 behaviour. The capital P headers are not correct because of frameworks on Mac. More info, see thread: http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2 Task-number: QTBUG-4685 Reviewed-by: Trust Me
| * Update copyright year to 2010Jason McDonald2010-01-06128-128/+128
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2010-01-052-0/+8
|\ \ | |/ | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * For maemo, do not strip the binaries during the installation.Adrian Constantin2009-12-301-0/+1
| | | | | | | | | | | | The binaries will be stripped during packaging. Reviewed-by: Tom Cooksey
| * Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen
* | Merge branch '4.6'Thiago Macieira2009-12-2610-15/+118
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Don't include dlfcn.h unconditionally.Thiago Macieira2009-12-251-1/+0
| | | | | | | | | | Task-number: QTBUG-3344 Reviewed-by: Trust Me
| * Add missing license headers to the new solaris-cc-stlport mkspecs.Thiago Macieira2009-12-252-0/+82
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-254-0/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: FTBFS on hurd-i386 because since clock_gettime is not available there Fix build on ARMv6 when NEON is detected. Add two new mkspecs for SunCC with stlport.
| | * Add two new mkspecs for SunCC with stlport.Thiago Macieira2009-12-254-0/+18
| | | | | | | | | | | | Untested, but not used anywhere yet, so this cannot cause any problems.
| * | Changed autodetection logic for stlport version and sqlite in SymbianMiikka Heikkinen2009-12-231-9/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | To support building Qt as part of Symbian SDK where epoc32 is not yet populated, changed the autodetection logic in determining stlport version. Now, we assume that we want the new version, unless only the old version exists on SDK already. Sqlite binaries export autodetection is now skipped if CONFIG value symbian_no_export_sqlite exists, allowing clean builds to explicitly suppress exporting. Task-number: QTBUG-6971 Reviewed-by: axis
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-172-3/+3
| |\
| | * Fix compilation on HP-UX 11.11.Tristan Chabredier2009-12-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: thread/qthread_unix.cpp: In static member function 'static int QThread::idealThreadCount()': thread/qthread_unix.cpp:325: error: aggregate 'pst_dynamic psd' has incomplete type and cannot be defined thread/qthread_unix.cpp:326: error: 'pstat_getdynamic' was not declared in this scope Task-number: QTBUG-6576 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Make mkspec/unsupported/linux-host-g++ use correct includeTom Cooksey2009-12-141-1/+1
| | | | | | | | | | | | Reviewed-By: Trustme
| * | Add "nocopy" mode for seperate-debug-info to configureTom Cooksey2009-12-141-1/+1
| |/ | | | | | | | | | | | | | | | | | | This patch was written by Harald Fernengel for Maemo5 port. This effectively just adds -g to QMAKE_CFLAGS & QMAKE_CXXFLAGS and is mainly for packagers who want to build Qt in release mode and still have debug symbols, but will want to strip those debug symbols out themselves (rather than let Qt do it). Reviewed-By: Harald Fernengel Reviewed-By: Thiago Macieira
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-154-188/+180
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * Add QMake configuration for Scratchbox's host-gcc compileraTom Cooksey2009-12-042-0/+180
| | | | | | | | Reviewed-by: Harald Fernengel
| * Remove the linux-g++-gles2-experimental mkspecTom Cooksey2009-12-042-188/+0
| | | | | | | | | | | | This mkspec has been replaced by linux-g++-maemo. Reviewed-by: Harald Fernengel
* | Fixed typing error in a variableunknown2009-12-022-0/+141
| | | | | | | | | | Merge-request: 1875 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge branch '4.6'Thiago Macieira2009-12-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf 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
| * qreal-izationAleksandar Sasha Babic2009-12-021-1/+1
| | | | | | | | | | | | | | Defining QT_USE_MATH_H_FLOATS will enable single precision math functions that are called via Qt wrappers (qSin, qCos ...). Reviewed-by: axis
* | Merge branch '4.6'Thiago Macieira2009-11-254-39/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Use relative paths when invoking mifconv.Janne Anttila2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some S60 SDK has a bug which make mifconv to crash with absolute paths. Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of using join of ICON keywords. Joining is not needed anymore since ICON keyword supports only one filename. Using input variable (QMAKE_FILE_IN) also esnures that absolute path is converted to relative before invoking mifconv. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * Unified ICON keyword handling for ABLD and SBSv2 toolchains.Janne Anttila2009-11-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SBSv2 toolchain only first file from ICON keyword is used and it is actually the right behaviour. Originally support for multiple files in ICON keyword was introduced to support localized application icons. However, in that case the different localized icons should not go to same MIF file since it is not possible to define in .rss file which icon number should be used for which language. To support a localized application icons separate MIF for each locale should be created and installation of ICON should depend on selected language. Implementing proper support for localized icons is left for another task. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
| * Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-181-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it possible to define ICON keyword in pro file without UID3. It is safe to use target as an icon name since Symbian devices cannot have two different binaries with the same name as all binaries are located in \sys\bin. This means there cannot be also two mif files with same target name. Also all native S60 apps use target name as an MIF basename. Target name is also much easier to associate with app than UID. Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
| * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-162-27/+0
| |\
| | * Revert "Using qreal more consistently in code (prevent misuse of double)"Aleksandar Sasha Babic2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 676780d515cedca85829ae962e4f501c5e5b6581. Conflicts: src/gui/painting/qblendfunctions.cpp
| | * Remove temp dirs workaround for raptor builds onlyShane Kearns2009-11-092-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webkit cannot build because of too long command lines in the sbsv2 config. There is an alternative workaround in raptor for the relative include paths problem, i.e. "sbs -c winscw_udeb.mwccinc" Removing the temp dirs from being created and added to systeminclude makes the command line short enough again that webkit can be compiled. Reviewed-By: Miikka Heikkinen Based on following commit from the no-tmp-dirs branch: commit 33e8c420bb40ca6194d29f96ef2fbd0f18340e6b Author: Iain <qt-info@nokia.com> Date: Wed Oct 7 13:45:48 2009 +0200 First attempt at removing the tmp dirs workaround on Symbian OS I may not have caught all the places where it is used, but MMP files look OK afterwards. TODO: Slightly concerned that I've trimmed too much from the abld generator as I think that the bit I cut was also used for other temp dirs
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0952-1/+86
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qblendfunctions.cpp
| | * | Using qreal more consistently in code (prevent misuse of double)Aleksandar Sasha Babic2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to force use of qreal where possible. This can lead to better performance on platforms where qreal -> float (i.e. ARM). To achieve this we: 1. changed from 'double' to 'qreal', where justified 2. using qreal() to intialize constants, where justified 3. adding helper functions that are overloaded for qreal like qAtan2(), qAcos(), qFabs() ... 4. defining QT_USE_MATH_H_FLOATS for Symbian platform In addtion we used opportunity to improve code with some small things 5. converting divisions to multiplications (i.e. '/ 2.0' -> '* qreal(0.5)') 6. defining new constants (i.e. 'Q_PI / 180.0' -> 'Q_PI180') 7. declaring variables as 'const', where justified Reviewed-by: Andreas Aardal Hanssen Reviewed-by: Gunnar Sletta Reviewed-by: Jan-Arve Reviewed-by: Kim Motoyoshi Kalland Reviewed-by: Alessandro Portale Reviewed-by: Janne Koskinen
* | | | Merge branch '4.6'Thiago Macieira2009-11-132-0/+74
|\ \ \ \ | |/ / /
| * | | Disable optimisations which break stack traces on MaemoTom Cooksey2009-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -O2 mode enables omit-frame-pointer & optimize-sibling-calls, which can break stack traces. So, even in release mode, disable these optimisations so that we can at least still get a backtrace when a Qt application dies. Reviewed-By: Stefano Pironato
| * | | Generate debug symbols in release mode on MaemoTom Cooksey2009-11-131-0/+4
| | | | | | | | | | | | | | | | Reviewed-By: Stefano Pironato
| * | | Add mkspec for Maemo 5 & 6Tom Cooksey2009-11-132-0/+70
| | |/ | |/| | | | | | | | | | Reviewed-By: Robert Griebl Reviewed-By: Thiago Macieira
* | | Merge branch '4.6'Thiago Macieira2009-11-1060-21/+178
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * | Merge branch '4.6-s60' into 4.6axis2009-11-061-10/+11
| |\ \ | | |/
| | * Initial LFLAGS support for qmake on Symbian OSIain2009-11-051-10/+11
| | | | | | | | | | | | Reviewed-by: Shane Kearns
| * | Merge commit 'origin/4.6' into large-file-supportJoão Abecasis2009-11-059-13/+84
| |\ \ | | |/
| | * Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-2/+10
| | | | | | | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| | * Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-042-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moved duplicated and broken code for setting up the include and library paths into the egl.prf feature file, which egl.pri and opengl.pro now includes using the qmake feature system. Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| | * Declarative building infrastructure.Warwick Allison2009-11-041-1/+2
| | | | | | | | | | | | Does nothing if no declarative directories installed.
| | * Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-023-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-292-3/+3
| | |\
generated by cgit v0.12 at 2024-12-28 17:23:06 (GMT)