summaryrefslogtreecommitdiffstats
path: root/mkspecs/qws
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2932-798/+798
| | | | | | | | 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>
* Update contact information in license headers.Sergio Ahumada2012-08-0132-64/+64
| | | | | | | | | | | | | - 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>
* Move qws/qnx-* mkspec files from unsupportedSamuli Piippo2012-03-0610-0/+346
| | | | | | | | As QNX in now a supported platform, move mkspec files away from unsupported folder. Change-Id: I31f806b5d5217cfb0420dc74dc7a5eea33c1598d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* INTEGRITY mkspecs updateKalle Viironen2012-02-236-0/+162
| | | | | | | | | | | Modifies existing structure of INTEGRITY mkspecs to be more clear and adds a new mkspec for INTEGRITY x86 target. This also moves mkspecs to supported folder as this is the case in 4.8.x. Task-number: QTBUG-24153 Change-Id: Iae893c20f88050040f7686ab2ab272c1d1af22bb Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1124-24/+24
| | | | | | | | | 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 proof-of-concept UIKit mkspecsIan2011-06-276-331/+0
| | | | | Merge-request: 1275 Reviewed-by: con
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-204-68/+68
|\
| * Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1326-464/+464
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1723-398/+397
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| * remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| | | | | | | | | | | | there is no need to disable stack protector unless one uses an ancient version of gcc. taken from kubuntu.
| * Update licenseheader text in source filesJyri Tahtela2011-05-1322-396/+396
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Compile fixes for GL ES and Maccon2011-04-052-1/+7
| | | | | | | | | | | | | | | | For QPA the unix tests are used to determine the availability of OpenGL ES, so they need to compile even on Mac. Similarly the includes in the OpenGL module have to be adapted on Mac. Acked-by: Jørgen Lind
* | Use the new QT_QPA_DEFAULT_PLATFORM_NAME define.con2011-03-222-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-172-40/+40
|\ \ | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
| | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-162-0/+4
| | | | | | | | | (Match the existing files for wince and vxworks.)
* | | Update NaCl mkspecs.Morten Johan Sørvig2011-03-164-407/+79
| | | | | | | | | | | | | | | Less duplication, use the common unix and gcc conf files.
* | | Do release build for devices and remove some warnings.con2011-03-112-2/+4
| | |
* | | Add proof-of-concept UIKit based lighthouse platform.con2011-03-106-0/+319
|/ / | | | | | | See the README in the uikit platform plugin for details.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1722-22/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2011.Jason McDonald2011-01-1022-22/+22
| | | | | | | | Reviewed-by: Trust Me
* | Fix the license in files for LighthouseJørgen Lind2010-10-282-78/+78
| |
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2219-19/+39
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | Refactor GCC mkspecs to share more configuration optionsTor Arne Vestbø2010-10-1319-19/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The g++ and llvm mkspecs now share the common parts in common/gcc-base.conf Each top level mkspec includes a platform-specific version of this base, either common/gcc-base-unix.conf or common/gcc-base-mac.conf, and these platform specific bases will include the cross-platform one. The same pattern is then used for the g++ specific configurations, which are split up into common/g++.conf, common/g++-unix.conf and common/g++-mac.conf The qplatformdefs.h for mac was also shared where possible. The test in tests/manual/mkspecs was used to ensure that the final output of all the mkspecs was the same after the refactoring as before. Reviewed-by: ossi
* | Fix QWS generic mac mkspecJørgen Lind2010-10-201-1/+1
| |
* | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-145-2/+523
|/ | | | | | | | | | | | | | This commits adds build system to support for the native client compiler (x86-only for now), sets up global defines, and adds compile fixes for QtCore and QtGui. Details: * Add mkspecs for linux-nacl-g++ and macx-nacl-c++ * Add nacl configure option * Add qconfig-minimal-system-dependencies.h * Define Q_OS_NACL in qglobal.h * Add qnacalunimplemented.h/cpp with POSIX stubs. * .pro file changes for cross-compiling on Mac
* s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-303-3/+3
| | | | Reviewed-by: joerg
* add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIXOswald Buddenhagen2010-02-263-0/+3
| | | | | | | | | | the unix makefile generator can make files for "regular" unixes and macos (the difference being the framework handling). so far, the output choice was hard-wired to the host platform. the previous commit made that soft-configurable, and this one exploits this capability to enable limited cross-building. Reviewed-by: mariusSO
* Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-1421-21/+21
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| * Update copyright year to 2010Jason McDonald2010-01-0621-21/+21
| | | | | | | | Reviewed-by: Trust Me
* | fix headersWarwick Allison2009-10-291-16/+16
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-043-9/+20
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: configure
| * renaming ppc mkspec to powerpcJørgen Lind2009-10-022-0/+0
| | | | | | | | Reviewed-by:paul
| * Give the qws ppc mkspec usable default valuesJørgen Lind2009-10-021-0/+11
| | | | | | | | | | | | and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1521-84/+84
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Update license headers again.Jason McDonald2009-09-0921-84/+84
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-3121-273/+273
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * Update tech preview license header.Jason McDonald2009-08-3121-273/+273
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-314-0/+164
|\ \ | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * Add missing license headers.Jason McDonald2009-08-284-0/+164
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1117-17/+17
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-1317-17/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
| * | Update contact URL in license headers.Jason McDonald2009-08-1217-17/+17
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-1917-34/+34
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1617-34/+34
| | | | | | | | Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-2342-0/+1329
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-222-0/+62
|
* Long live Qt!Lars Knoll2009-03-2342-0/+1329