summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_functions.prf
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrect Symbian version check.Miikka Heikkinen2011-08-241-3/+1
| | | | | | This check is unnecessary and doesn't work post-Symbian3 SDKs. Reviewed-by: Sami Merila
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-3/+3
|\ | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-211-3/+3
| | | | | | | | | | | | | | | | | | | | This allows overriding the NetworkServices capability for the applications that do not need the capability even though they link network, webkit, or declarative. It is also more intuitive as there are no magic additions to user defined capabilities. Task-number: QTBUG-17540 Reviewed-by: Janne Koskinen
| * Added detection of bat files to the qtPrepareTool function.axis2011-01-181-1/+7
| | | | | | | | | | | | Not all tools end with .exe. Some also end in .bat. RevBy: Oswald Buddenhagen
* | Workaround public header depending on private in symbian^3Shane Kearns2011-02-081-1/+6
| | | | | | | | | | | | | | f32file.h (public) depends on e32svr.h (private), and in symbian^3 the private headers have been moved to a different include path. Reviewed-by: axis
* | Add packagesExist() function to qmake.Robin Burchell2011-01-171-0/+14
| | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-4/+11
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+11
| | | | | | | | | | | | | | | | | | | | Any application linking to QtNetwork, QtWebKit, or QtDeclarative is likely to utilize network, so add NetworkServices capabiltity for these applications by default in Symbian. Also increased the default epocheap maximum size for these applications. Task-number: QTBUG-14472 Reviewed-by: Janne Koskinen
* | Added detection of bat files to the qtPrepareTool function.axis2010-10-211-1/+7
|/ | | | | | Not all tools end with .exe. Some also end in .bat. RevBy: Oswald Buddenhagen
* Always add QtNetwork include path when linking with QtWebkit in SymbianMiikka Heikkinen2010-06-181-1/+2
| | | | | | | | | | Due to relative include problem with Symbian toolchains, it is necessary to have include/QtNetwork in systeminclude paths when there is #include <QtWebkit> statement in a source file, as QtWebkit header includes QtNetwork header. Task-number: QTBUG-11494 Reviewed-by: Janne Koskinen
* fix regexpOswald Buddenhagen2010-05-141-1/+1
|
* define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-141-0/+11
| | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* Build fix for QtXmlPatterns' examples on SymbianFrans Englich2009-10-271-0/+4
| | | | | | This is the same workaround as Janne did for QtWebkit. Reviewed-by: Janne Koskinen
* QtWebkit demos&examples compilation fix for SymbianJanne Koskinen2009-10-141-3/+9
| | | | | | | | Fix for applications not compiling containing #include<QtWebkit> due to relative inclusion problem in Symbian build environment. Task-number: QTBUG-4846 Reviewed-by: Iain
* Avoid adding a debug library to the glue projects, when debug_and_releaseMarius Storm-Olsen2009-10-071-1/+1
| | | | | | | | | | | | | The VCPROJ/SLN generator generates dependencies on the glue project, so the glue must use the correct library for the dependencies to be correct. The qtAddLibrary() would add the project 'default' to the glue, which could end up adding a debug lib to the glue, so the dependency checker wouldn't find the proper project. We therefore force qtAddLibrary to only add d/_debug if we're not using debug_and_release, or not in the glue part Reviewed-by: Rohan McGovern
* Webcore build break on Symbian fixJanne Koskinen2009-09-281-2/+1
| | | | | | | | Prepending adds epoc32\include too early into generated systeminclude path search order causing Webcore build to break due to wrong animation.h header getting included. Reviewed-by: Jason Barron
* Fix compilation of files that #include <QtGui> on newer Symbian SDKs.Jason Barron2009-09-251-0/+5
| | | | | | | | | | | | The new public classes in the 's60framework' sub-directory of QtGui introduce a header file dependency to the middleware layer of the SDK by including 'aknapp.h'. Since the build system doesn't know if you have included QtGui or not, the closest approximation is to append the middleware layer include path in cases where the QT variable contains 'gui' Reviewed-by: axis
* Long live Qt!Lars Knoll2009-03-231-0/+66
generated by cgit v0.12 at 2024-08-23 03:22:49 (GMT)