summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
| | | | | Merge-request: 2374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix nmake build with win32-msvc2010Joerg Bornemann2010-04-262-2/+2
| | | | Reviewed-by: Martin Petersson
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-181-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+2
| |
* | Fix check for arm based systemsThomas Zander2010-04-161-2/+2
|/ | | | The lib is only on the phone, so check the dso file instead.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-142-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| * Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-121-12/+29
| |\ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp
| * | Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.Dominik Riebeling2010-04-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the configuration option "-config silent" building on MinGW fails due to the use of the backslash as path delimiter. Using DIR_SEPARATOR instead of the hardcoded delimiter (like done for MOC) fixes this. Reviewed-by: aavit Merge-request: 1697 Reviewed-by: aavit <qt-info@nokia.com>
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-2/+8
|\ \ \ | |_|/ |/| |
| * | Implement some changes to the AIX xlC mkspec suggested by IBM.Thiago Macieira2010-04-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set -bmaxdata to 0x8000000 for normal 32-bit Qt programs, to allow them to access more memory. Increase that limit to the maximum allowed when linking to QtWebKit (even though we don't support WebKit with xlC, there are patches to do that). For 64-bit, simply add the "big TOC" flag, which enables accessing more symbols that cannot be reached by a 16-bit addressing. Only QtWebKit strictly needs it, but IBM suggests as a good flag for everyone. Reviewed-by: Thomas Zander
* | | Make compiling / linking a non-qt app work too on symbian/gcceThomas Zander2010-04-081-5/+13
| | |
* | | Fix library creation on symbian/gcceThomas Zander2010-04-071-0/+1
| | |
* | | Various fixes for symbian/gcce building.Thomas Zander2010-04-071-12/+20
| |/ |/|
* | Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
| |
* | Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
| |
* | Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+1
| | | | | | | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-3/+7
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg statements were generated in invalid order if user used pkg_prerules to redefine languages supported by the pkg file. Also made it possible to override dependency statements autogenerated for Qt and QtWebkit, as these statements need to be user defined in case of multiple languages. Defining the following in .pro removes all dependencies from pkg rules: default_deployment.pkg_prerules -= \ pkg_depends_webkit \ pkg_depends_qt \ pkg_platform_dependencies Task-number: QTBUG-9279 Reviewed-by: Janne Anttila
* | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
| | | | | | | | | | | | We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
* | Fixed regular expression matching.axis2010-03-231-1/+1
| | | | | | | | | | We need extra backslashes, otherwise it tries to match the '|' verbatim.
* | More fool proof way for finding these headersThomas Zander2010-03-231-1/+1
| |
* | Make ICON generation (to symbian mif) work for relative paths/shadow buildsThomas Zander2010-03-221-0/+2
| |
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | Switched out QT_SOURCE_TREE, which is not defined for user apps.axis2010-03-221-1/+1
| |
* | Fixed Symbian applications with DESTDIR set.axis2010-03-161-1/+1
| |
* | Removed a warning about generated rss files.axis2010-03-162-28/+53
| | | | | | | | | | | | Also cleaned up the "clean" and "distclean" targets a bit. Task: QTBUG-8854
* | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-162-0/+15
| | | | | | | | RevBy: Miikka Heikkinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-162-55/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-152-55/+43
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| | * Fixed RSS_RULES statement in application_icon.prfMiikka Heikkinen2010-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | RSS_RULES were being overwritten instead of being appended to in applicaton_icon.prf. Reviewed-by: Janne Anttila
| | * Added some missing IBY export paths to platform_path.prfMiikka Heikkinen2010-03-101-54/+42
| | | | | | | | | | | | | | | | | | | | | | | | Also removed some IBY export paths that target layers below middleware, as those are not likely to be ever needed by Qt projects, since Qt itself is part of the middleware layer. Reviewed-by: Janne Anttila
* | | Fixed a building bug where the DLL entry point was undefined.axis2010-03-151-1/+1
| | |
* | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-0/+15
| | | | | | | | | | | | | | | | | | This enables it to be used by all Symbian build systems. RevBy: Miikka Heikkinen
* | | Moved two profiles to the correct directory.axis2010-03-112-0/+260
| | | | | | | | | | | | This gets applications building again.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-112-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-1/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| | * Make `make check' build the checked project.Rohan McGovern2010-03-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `check' rule ought to depend on the project being built, so one can simply do `make check' instead of `make && make check'. Note that there was already an attempt to do this for the autotests, but it did not work on non-Windows platforms, because $(DESTDIR_TARGET) is only used in the Windows makefile generators. Reviewed-By: Lincoln Ramsay
* | | Make sure that we have all compile flags available alwaysThomas Zander2010-03-092-2/+2
| | | | | | | | | | | | | | | | | | Users may do a CONFIG -= qt which means that the qt.prf won't be loaded. So, lets make sure we don't have any critical properties in those files.
* | | Added Symbian def file support to Linux build system.axis2010-03-081-26/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also switches the official def file variable in qmake profiles to DEF_FILE. Support for freezing def files was also added, but needs more work and is therefore disabled for now. Task: QTBUG-7510 Task: QTBUG-8052
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-013-2/+66
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | Merge branch '4.6'Miikka Heikkinen2010-02-261-0/+33
| |\ \ | | |/ | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * Added addMMPRules for adding conditional MMP_RULESMiikka Heikkinen2010-02-261-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: # Set conditional libraries LIB.MARM = "LIBRARY myarm.lib" LIB.WINSCW = "LIBRARY mywinscw.lib" LIB.default = "LIBRARY mydefault.lib" # Set conditional Epoc Heap Size EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000" EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000" # Add the conditional MMP rules MYCONDITIONS = MARM WINSCW MYVARIABLES = LIB EHZ addMMPRules(MYCONDITIONS, MYVARIABLES) This will generate the following in the mmp file: #if defined(MARM) LIBRARY myarm.lib EPOCHEAPSIZE 0x40000 0x400000 #elif defined(WINSCW) LIBRARY mywinscw.lib EPOCHEAPSIZE 0x2000 0x2000000 #else LIBRARY mydefault.lib EPOCHEAPSIZE 0x40000 0x400000 #endif Task-number: QT-2909 Reviewed-by: axis
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-262-2/+33
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | * Define a GNU-style `check' target for all projects.Rohan McGovern2010-02-251-0/+11
| | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
| | * Fixes: make check not checking that target is up to dateBill King2010-02-221-2/+22
| | | | | | | | | | | | | | | | | | | | | Builds the target executable if needed before running the test LR on BKing's machine. Reviewed-by: Lincoln Ramsay
* | | Corrected a wrong comment.axis2010-02-261-1/+1
| | |
* | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Spaces in filenames still won't work, but that is very tricky to fix because you cannot escape filenames inside the QMAKE_EXTRA_COMPILERS section. Task: QTBUG-8555
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-234-12/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
generated by cgit v0.12 at 2025-01-04 11:03:14 (GMT)