summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* A small hack to enable gles2 at configure timeGunnar Sletta2009-08-062-0/+186
| | | | Reviewed-by: Trond
* Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-061-3/+2
|
* Merge AudioServices into mainline.Justin McPherson2009-08-051-1/+2
|
* Fix obsolete license headersJason McDonald2009-08-044-8/+8
| | | | Reviewed-by: Trust Me
* Port of Qt to QNXHarald Fernengel2009-07-298-0/+653
| | | | | | | | This makes Qt work on QNX 6.4. * no q3support, no phonon * no QSharedMemory, no QSystemSemaphore, no QProcess Reviewed-By: Robert Griebl
* Port of Qt to VxWorksRobert Griebl2009-07-299-0/+612
| | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+2
|\ | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| * fix qmake syntaxOswald Buddenhagen2009-07-201-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| * Revert 6b9328 and fix the original dependency problem againAndy Shaw2009-07-151-0/+6
| | | | | | | | Reviewed-by: Joerg
| * Don't cause a rebuild of the application when mocinclude.tmp is usedAndy Shaw2009-07-151-2/+0
| | | | | | | | | | | | | | Since the mocinclude.tmp file was a dependency of all the generated moc files, it would always cause a rebuild of the code when doing a make. Reviewed-by: Joerg
* | Make openvg.prf work properlyRhys Weatherley2009-07-192-2/+9
| | | | | | | | | | | | | | This change makes "QT += openvg" include the right includes and libs via openvg.prf automatically. Reviewed-by: trustme
* | Fix compilation of webkit with mingwThierry Bastian2009-07-151-3/+0
| |
* | Build fix for mingwThierry Bastian2009-07-141-1/+1
| | | | | | | | | | we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
* | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.5'Marius Storm-Olsen2009-06-301-2/+2
|\ \ | |/
| * Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-2/+2
| | | | | | | | | | | | The configuration option was not added to the Windows configure. Reviewed-by: hjk
* | Merge branch '4.5'Thiago Macieira2009-06-242-4/+2
|\ \ | |/ | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-232-4/+2
| | | | | | | | | | | | | | | | | | | | | | The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig
* | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-243-0/+13
| | | | | | | | | | | | | | ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
* | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-225-1/+14
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-16100-200/+200
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-16100-200/+200
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * keep CONFIG+=silent working with the new translations.pro fileBradley T. Hughes2009-06-121-1/+1
| |
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-6/+10
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Ensure that the manifest files are placed correctlyAndy Shaw2009-06-082-6/+10
| | | | | | | | | | | | | | | | If OBJECTS_DIR was empty then it would create a directory for the manifest files in the root directory. This is not desired as it should create a directory in the build directory instead. Reviewed-by: Marius Storm-Olsen
* | Merge branch '4.5'Tom Cooksey2009-05-281-2/+5
|\ \ | |/ | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-281-2/+5
| | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-226-81/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| * \ Merge branch '4.5'Thiago Macieira2009-05-144-5/+16
| |\ \ | | |/ | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| | * Fixes build issue with WinCE and MSVC 2008 and MIPS-IIAndy2009-05-141-1/+1
| | | | | | | | | | | | Reviewed-by: Maurice
| | * Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-133-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turning on LTCG affected too many projects, where customers applications would take a long time linking, severly affecting their development time (even though it was only added for release builds) We turn it off by default, and add a -ltcg configuration option, and the possibility to also do CONFIG+=ltcg in projects, should they not want it for Qt, but in their own projects. (Same, they can build Qt with it, and do CONFIG-=ltcg for their project) Reviewed-by: andy
| * | Merge branch '4.5'Thiago Macieira2009-05-113-9/+8
| |\ \ | | |/
| * | Change optimization flags from Os to O2 for OS X applications.Morten Sørvig2009-05-081-1/+1
| | | | | | | | | | | | | | | | | | Qt itself was O2 from 4.2 and up, this changes it for applications as well. Reviewed-by: nrc
| * | Merge branch '4.5'Thiago Macieira2009-04-201-4/+6
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-04-151-23/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * \ \ \ \ Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-073-0/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * \ \ \ \ \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-022-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-2/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-3/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-271-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * | | | | | | | | | Long live Qt!Lars Knoll2009-03-23321-0/+18744
| / / / / / / / / /
* | | | | | | | | | kill experimental QtAnimation module stuff, the module doesn't exist anymoreKent Hansen2009-05-201-2/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-126-31/+75
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | | | | | | | macx-g++42 spec linker was gcc instead of gcc-4.2João Abecasis2009-05-083-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d Task-number: 253052 Reviewed-by: Norwegian Rock Cat Reviewed-by: MortenS
| * | | | | | | | | Make the g++-42 mkspec use gcc-4.2 for linking as well.Morten Sørvig2009-05-081-2/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to override the linker, causing it to use gcc 4.0. Reviewed-by: Richard Moe Gustavsen
| * | | | | | | | do not add UI_DIR to INCLUDEPATH if no FORMS are usedOswald Buddenhagen2009-04-201-4/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | | | | | fix compilation of QtWebKit with Visual StudioJoerg Bornemann2009-04-201-1/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a and 014af3e99616f9ee13ca365566828f7daf77a7f6 broke the Qt build for Visual Studio / IncrediBuild. The problem is as follows: QtWebKit has too many entries in INCLUDE_PATHS. In moc.prf is a rule that builds a mocinclude.tmp that contains command line options for moc. moc gets then called with @mocinclude.tmp. Above commits create an QMAKE_EXTRA_TARGET for the mocinclude.tmp, which is necessary for parallel MinGW builds. Alas, qmake -tp vc doesn't support QMAKE_EXTRA_TARGET. See task 189914. Once this task is solved, this commit must be reverted. Reviewed-by: joao
generated by cgit v0.12 at 2024-11-26 17:35:42 (GMT)