summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
* | 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
* | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-201-6/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits) Doc: these files are NOT part of the test suite of the Qt toolkit Autotest: make the licenseCheck test also check .qdoc files use egl properties when creating surfaces on symbian work around the current include file structure on Symbian^3 Get rid of the dependency on the Symbian app layer Fix incorrect license headers Fix incorrect license headers tst_qnetworkreply: Check if TCP/HTTP connection got re-used Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 Fix building in a namespace on Windows Supressed Icon sizes on QPushButton in QS60Style Ensure that posted events are sent on Windows Fixed off-by-one blending errors in the NEON drawhelper code. Fixed libstdcpp.dll version autodetection for Symbian Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations. ColorDialog is always shown as stripped-down version (for QVGA) ...
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-203-6/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-6/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| | * | Fixed libstdcpp.dll version autodetection for SymbianMiikka Heikkinen2010-02-191-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libstdcpp.dll version autodetection was broken for clean builds, so made it default for new version when neither new or old can be detected. Task-number: QT-1171 Reviewed-by: Janne Anttila
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-201-0/+114
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added exception to destdir location for abld and sbsv2. Moved the "sis" target and friends from cpp code to qmake profiles.
| * | | Added exception to destdir location for abld and sbsv2.axis2010-02-191-3/+7
| | | | | | | | | | | | | | | | It was supposed to be in my last commit, but I forgot it.
| * | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-191-0/+110
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This was done in order to use the same targets for multiple mkspecs. The "store_build" target of sbsv2 had to remain separate, because it depends on using flms. RevBy: Miikka Heikkinen
* | | amend "purge msvc.net and msvc2002 makespecs"Oswald Buddenhagen2010-02-173-6/+2
|/ / | | | | | | | | | | | | - win32-msvc.net/qplatformdefs.h was included from msvc2003. inline it. - purge references to msvc.net from feature files Reviewed-by: mariusSO
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-1/+1
|\ \ | |/
| * Removed dependency to moc.exe from Symbian buildsMiikka Heikkinen2010-02-101-1/+1
| | | | | | | | | | | | | | | | Having dependency to moc.exe makes no sense since we cannot build it anyway when building with Symbian toolchain. Task-number: QTBUG-7836 Reviewed-by: Janne Koskinen
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-093-38/+48
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Do not run the tests automatically during install.Janne Hämäläinen2010-02-081-15/+11
| | | | | | | | | | | | | | | | | | A separate "check" rule added for running the tests. Use "make check" to run the tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
| * Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-042-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where all target types, including apps, plugins and static libraries were getting DEFFILE statements - now it's just libraries that get it. Fix bug where duplicate DEFFILE blocks were being added to projects that manually specified their own DEFFILE - this now tests for the qmake variable "defBlock" being set, and doesn't add additional DEFFILE statements if it is. NOTE: This means that adding DEFFILE statements to MMP_RULES manually should be done by creating a variable called defBlock, and adding that to the MMP_RULES (ie. MMP_RULES += defBlock) Fix bug in configure.exe, where using -nokia-developer for Windows builds would warn about Symbian DEF file usage (or lack thereof) Reviewed-by: Janne Koskinen Reviewed-by: Jason Barron
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-042-13/+0
| | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-012-0/+33
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Improve DEF file enable/disable mechanism on SymbianIain2010-01-222-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide configure flag to enable/disable the use of DEF files on Symbian. A useful side-effect was that it cleaned up how we control DEF files from qbase.pri and in WebKit. -nokia-developer still disables DEF files, as it triggers the autotest exports, which are not frozen into the DEF files. Disabling DEF files means that there is no BC with previously released versions of Qt, so this should only be used for development purposes. .pro files can specify custom locations for DEF files by setting defFilePath. Task-number: QTBUG-6556 Reviewed-by: Jason Barron
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-221-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| * | Fixed the host detection in qmake profiles.axis2010-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | The previous tests were checking the target platform, but we need to check the host. RevBy: Trust me
| * | Merge branch 'merge-request-1601' into master-s60axis2010-01-051-2/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
| | * | Add Linux host support to Symbian mkspecs.Anderson Lizardo2009-11-171-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
* | | | Merge branch '4.6'Thiago Macieira2010-01-181-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has ↵Norbert Leser2010-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed /epoc32/include layout, including a subdirectory called "platform". Since that particular directory is used as test for detecting SDKs with "New SF structure", the test returns with false result in case of pf_5250 (which has old SF structure). Change was made to test for a more obscure directory "mw" that appears the be present in new structure only. Merge-request: 2281 Signed-off-by: axis <qt-info@nokia.com>
* | | | Merge branch '4.6'Thiago Macieira2010-01-131-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | Attempt at readding the capital P headers for PhononThiago Macieira2010-01-061-0/+1
| | | |
| * | | Remove special Phonon processing from syncqt.Thiago Macieira2010-01-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore original Qt 4.4 behaviour. The capital P headers are not correct because of frameworks on Mac. More info, see thread: http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2 Task-number: QTBUG-4685 Reviewed-by: Trust Me
* | | | Merge branch '4.6'Thiago Macieira2010-01-051-0/+7
|\ \ \ \ | |/ / / | | / / | |/ / |/| | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * | Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen
* | | Merge branch '4.6'Thiago Macieira2009-12-262-10/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * | Changed autodetection logic for stlport version and sqlite in SymbianMiikka Heikkinen2009-12-231-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support building Qt as part of Symbian SDK where epoc32 is not yet populated, changed the autodetection logic in determining stlport version. Now, we assume that we want the new version, unless only the old version exists on SDK already. Sqlite binaries export autodetection is now skipped if CONFIG value symbian_no_export_sqlite exists, allowing clean builds to explicitly suppress exporting. Task-number: QTBUG-6971 Reviewed-by: axis
| * | Add "nocopy" mode for seperate-debug-info to configureTom Cooksey2009-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was written by Harald Fernengel for Maemo5 port. This effectively just adds -g to QMAKE_CFLAGS & QMAKE_CXXFLAGS and is mainly for packagers who want to build Qt in release mode and still have debug symbols, but will want to strip those debug symbols out themselves (rather than let Qt do it). Reviewed-By: Harald Fernengel Reviewed-By: Thiago Macieira
* | | Merge branch '4.6'Thiago Macieira2009-11-252-12/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * | Use relative paths when invoking mifconv.Janne Anttila2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some S60 SDK has a bug which make mifconv to crash with absolute paths. Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of using join of ICON keywords. Joining is not needed anymore since ICON keyword supports only one filename. Using input variable (QMAKE_FILE_IN) also esnures that absolute path is converted to relative before invoking mifconv. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * | Unified ICON keyword handling for ABLD and SBSv2 toolchains.Janne Anttila2009-11-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SBSv2 toolchain only first file from ICON keyword is used and it is actually the right behaviour. Originally support for multiple files in ICON keyword was introduced to support localized application icons. However, in that case the different localized icons should not go to same MIF file since it is not possible to define in .rss file which icon number should be used for which language. To support a localized application icons separate MIF for each locale should be created and installation of ICON should depend on selected language. Implementing proper support for localized icons is left for another task. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * | Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
| * | Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-181-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it possible to define ICON keyword in pro file without UID3. It is safe to use target as an icon name since Symbian devices cannot have two different binaries with the same name as all binaries are located in \sys\bin. This means there cannot be also two mif files with same target name. Also all native S60 apps use target name as an MIF basename. Target name is also much easier to associate with app than UID. Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.6'Thiago Macieira2009-11-105-10/+67
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-2/+10
| | | | | | | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * | Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-041-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moved duplicated and broken code for setting up the include and library paths into the egl.prf feature file, which egl.pri and opengl.pro now includes using the qmake feature system. Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * | Declarative building infrastructure.Warwick Allison2009-11-041-1/+2
| | | | | | | | | | | | Does nothing if no declarative directories installed.
| * | Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-021-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
generated by cgit v0.12 at 2024-11-20 10:54:13 (GMT)