summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* 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
* Merge AudioServices into mainline.Justin McPherson2009-08-051-1/+2
|
* Port of Qt to VxWorksRobert Griebl2009-07-291-0/+63
| | | | | | | | | | | | | | | | | | | | | | | 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
| |
* | 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
* | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-242-0/+10
| | | | | | | | | | | | | | 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-224-1/+11
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | 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'Thiago Macieira2009-05-141-0/+5
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-04-201-4/+6
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * do not add UI_DIR to INCLUDEPATH if no FORMS are usedOswald Buddenhagen2009-04-201-4/+6
| | | | | | | | Reviewed-by: mariusSO
* | 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
| * 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
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-23/+40
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Fixes WebKit still occasionally failing to compile with MinGW whenRohan McGovern2009-04-151-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | passing any `-j' to make. Change 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a made the problem much less likely to occur, but in a debug_and_release build, debug and release would share the same mocinclude.tmp. Therefore, if exceptionally unlucky, the bug could still arise. Put mocinclude.tmp under MOC_DIR so each exclusive build has its own. Reviewed-by: Lincoln Ramsay
| * Fixes compile of WebKit with MinGW when using any `-j' option to buildRohan McGovern2009-04-131-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in parallel. On Windows, when a project has a lot of INCLUDEPATHs, some extra logic takes place to work around an issue of large command lines. Instead of passing all the paths directly to moc.exe, the paths are written to mocinclude.tmp which is then read from by moc.exe. Prior to this change, every moc rule tries to write to mocinclude.tmp. When running make with -j, this will happen in parallel, causing this error message: "The process cannot access the file because it is being used by another process" Change the logic so mocinclude.tmp is generated by its own rule. Reviewed-by: Lincoln Ramsay
* | 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
| * make shadow builds with default moc/ui dirs work againOswald Buddenhagen2009-04-073-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | append the source dir to the include path, but only after the dirs with the generated files. this seems to have worked before only accidentally: the unqualified default dirs were expanded to the source dir instead of the build dir, but the build dir is added implicitly by default, so things magically worked. now that we qualify the moc/ui dirs, projects relying on the strange side effect suddenly break. we should probably add the source dir to the include path by default, but this coupling to uic/moc is closer to the historical behavior and thus should be safer. Reviewed-by: mariusSO
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-022-2/+2
|\ \ | |/
| * some more quoting for qmake ...Oswald Buddenhagen2009-04-022-2/+2
| | | | | | | | sometimes, even two reviews are not enough ...
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-2/+8
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992fOswald Buddenhagen2009-04-022-2/+8
| | | | | | | | | | | | | | this time, it can deal with directories which are absolute to start with. Reviewed-by: mariusSO
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-3/+0
|\ \ | |/
| * Revert "don't include uic in non-gui configurations"Rohan McGovern2009-03-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7d2c8eb99c563b4fb236fe538123255f52f293a2. This commit was not reviewed and breaks compile of QtNetwork on win32 with this error... src\network\kernel\qauthenticator.cpp(55) : fatal error C1083: Cannot open include file: '../3rdparty/des/des.cpp': No such file or directory ... because the generated Makefile no longer contains src/network as an include path.
* | 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
| * Revert "make shadow builds work even if a non-shadow build is present"Bradley T. Hughes2009-03-272-2/+2
| | | | | | | | This reverts commit 3aff9113a9702ea6f7e099a73136a718ae1b992f.
| * don't include uic in non-gui configurationsOswald Buddenhagen2009-03-271-0/+3
| | | | | | | | | | | | | | | | | | uic is set in default_pre. this leads to useless -I compiler flags when no ui files are used in fact, so it would be nice to get rid of it in cases where it is not used. for backwards compat, don't remove it from the _pre, but add some magic to _post to remove it again if QT does not contain gui. of course, we need a force_uic CONFIG to enable an exception for QtGui itself ...
| * make shadow builds work even if a non-shadow build is presentOswald Buddenhagen2009-03-272-2/+2
| |
| * Long live Qt 4.5!Lars Knoll2009-03-2379-0/+1344
|
* Long live Qt!Lars Knoll2009-03-2379-0/+1271
generated by cgit v0.12 at 2024-11-30 05:20:39 (GMT)