summaryrefslogtreecommitdiffstats
path: root/mkspecs/qws
Commit message (Collapse)AuthorAgeFilesLines
* 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
generated by cgit v0.12 at 2024-11-15 15:12:45 (GMT)