summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-196-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: doc/src/index.qdoc doc/src/topics.qdoc src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h tests/auto/auto.pro
| * mingw: make it possible to build without rtti supportThierry Bastian2009-08-181-0/+1
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMorten Sorvig2009-08-174-4/+4
| |\
| | * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
| * | Fix compiler flags setting for .mm files on Mac.Morten Sorvig2009-08-171-2/+1
| |/ | | | | | | | | | | Commit 7f1cba82 causes {x86, x86_64, ppc, ppc64}.prf to be loaded before objective_c.prf. This will add content to QMAKE_OBJECTIVE_CFLAGS, causing the isEmpty test to skip populating QMAKE_OBJECTIVE_CFLAGS. Remove the isEmpty test to fix the issue.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-08-171-0/+15
|\ \ | |/ | | | | kinetic-declarativeui
| * Remove yet another forgotten debug message.Morten Sorvig2009-08-131-1/+0
| |
| * Pick a suitable default architecture for qmake-based applications.Morten Sorvig2009-08-131-0/+16
| | | | | | | | | | | | | | | | | | If the Qt package contains one of x86 and x86_64, pick that one. If it contains both then use the compiler default. Make a similiar decision for PowerPC-based systems. Note that this logic assumes that Qt has been configured with an architecture that is usable on the system. Reviewed-by: Marius Storm-Olsen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-13119-117/+398
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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-12111-111/+111
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtThomas Hartmann2009-08-101-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-102-0/+186
| | |\
| | * | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
| * | | New mkspecs for Windows Mobile 6.5Thomas Hartmann2009-08-106-0/+95
| | |/ | |/| | | | | | | | | | | | | | | | We need extra mkspecs for Windows Mobile 6.5 to support gestures, since gestures are only supported with 6.5 Reviewed-by: Maurice
| * | 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
* | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-3017-0/+1265
|\ \ | |/ | | | | | | Conflicts: src/gui/widgets/qlinecontrol_p.h
| * 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
* | Convert linux-g++-x11egl/qmake.conf from DOS to Unix linefeeds.Simon Hausmann2009-07-241-30/+30
| | | | | | | | Reviewed-by: Trustme
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-233-7/+15
|\ \ | |/ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * 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
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-151-1/+1
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | 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.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-101-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-026-6/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * | 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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-246-1/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-19101-201/+201
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-092-6/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | 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
generated by cgit v0.12 at 2025-01-09 19:54:24 (GMT)