summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2149-79/+173
|\ | | | | | | | | Conflicts: mkspecs/features/symbian/platform_paths.prf
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-201-1/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::hasFocus() performance regression. Fix crashes in QByteArray Move the labels a bit down so that they align better vertically with the field. Add command to qmake to do symbian-uid generation Fixed QBitmap::load to load into bitmap format again. Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. Text drawing is not fast currently
| | * Add command to qmake to do symbian-uid generationThomas Zander2010-01-201-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | The UID3 as required by symbian has to be auto-generated when the user doesn't supply one. To allow this to be done in a mkspec we need a function to do the hashing. This method adds that. Reviewed-By: Marius Storm-Olsen
| * | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
| |/ | | | | | | | | | | | | | | | | | | Previous s60installs specific fix was flawed in that it failed to generate exports when doing clean build. Replaced that with a more generic solution that exports plugin stubs under \epoc32\data\z always. Task-number: QTBUG-6972 Reviewed-by: Janne Anttila
| * Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| | | | | | | | | | | | | | Make sure we always use the absolute path to the pro file so it will just work from either source or build dir. This fixes the usecase where qmake generated a relative path starting with '..'
| * Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | | | | | | | | | | | | | The code generated would always create the Makefile in the sourcedir, even if you had src!=build Reviewed-By: Thiago
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0949-49/+49
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-8/+5
| | |\
| | * | Update copyright year to 2010Jason McDonald2010-01-0649-49/+49
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-071-6/+1
| | |/ | |/| | | | | | | Reviewed-by: axis
| * | Minor logic fix to Symbian generator in qmakeMiikka Heikkinen2010-01-051-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | The include meant to be under restore_build was getting included always. This is actually how it should work, so removed the empty restore_build target entirely. Reviewed-by: Janne Anttila
| * | Deal with test cases that crash or hangShane Kearns2010-01-041-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Added an optional timeout to runonphone - the application will be killed after this time. Used when autotesting unattended, as some tests can hang. Handled the just in time debug halting the application when it is about to crash, by terminating the application. In future, we could capture a call stack or something here. Also added quiet/verbose options to control the amount of output from runonphone. Reviewed-by: Janne Koskinen
| * Changed make sis only require .make.cache if QT_SIS_TARGET is not set.Miikka Heikkinen2009-12-221-2/+4
| | | | | | | | | | | | | | | | | | The .make.cache file contents are ignored if QT_SIS_TARGET environment variable is set, so there is no point in requiring its existence in those cases. Task-number: QTBUG-4617 Reviewed-by: Janne Anttila
| * Added more specific clean targets for Symbian buildsMiikka Heikkinen2009-12-222-3/+57
| | | | | | | | | | | | | | Also fixed sbsv2 build targets 'make release' and 'make debug'. Task-number: QTBUG-5156 Reviewed-by: Janne Koskinen
| * Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-214-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tool uses TRK to launch the application. TRK is a debug agent, available as a signed package for consumer phones. For Nokia phones, it is distributed with carbide; for other manufacturers it can be downloaded from their developer websites. The launcher code is reused from Qt creator, with a patch to allow us to pass command line arguments to the process being launched. The "make run" target is enhanced to support running on target as well as the emulator. Like the "make sis" target, the last platform to have been built is the one that will be launched. The runonphone tool needs to be built in a Qt environment configured for windows, and requires at least windows XP (Symbian development requires windows XP SP2). Current proposal is to include a statically linked exe in the bin directory for binary packages. Reviewed-by: Janne Koskinen
* | Better fix for build!=src Makefile generationThomas Zander2010-01-191-5/+3
| | | | | | | | | | | | | | Make sure we always use the absolute path to the pro file so it will just work from either source or build dir. This fixes the usecase where qmake generated a relative path starting with '..'
* | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-191-8/+8
| | | | | | | | | | The code generated would always create the Makefile in the sourcedir, even if you had src!=build
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-189-118/+190
|\ \ | |/ | | | | | | | | Conflicts: configure src/gui/text/qfontdatabase_s60.cpp
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-172-2/+5
| |\
| | * Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Marius SO Details: It worked fine for Makefiles since no checking is done of the flags. Now its fixed so it works for vcproj files too making it easier for people to build 64bit targets in Visual Studio.
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-111-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| | * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-092-50/+111
| | |\
| | * | Apparently fixes some build issues on some old unixes...Pierre Rossi2009-12-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
| * | | Fixed "make run" target for targets with special characters in them.Miikka Heikkinen2009-12-102-13/+13
| | |/ | |/| | | | | | | | | | | | | Some misc whitespace got fixed, too. Reviewed-by: Janne Anttila
| * | MMP_RULES overriding qmake variables now warns userMiikka Heikkinen2009-12-042-50/+111
| |/ | | | | | | | | | | | | | | | | | | | | Added warning to qmake when it detects MMP_RULES that override MMP statements created by qmake variables. Also harmonized the way << operator is used with #defined strings in symmake.cpp. Task-number: QTBUG-5407 Reviewed-by: Janne Anttila
| * Fix ICON keyword to work with absolute paths also in SBSv2.Janne Anttila2009-11-201-1/+4
| | | | | | | | | | Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-186-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove temp dirs workaround for raptor builds onlyShane Kearns2009-11-096-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webkit cannot build because of too long command lines in the sbsv2 config. There is an alternative workaround in raptor for the relative include paths problem, i.e. "sbs -c winscw_udeb.mwccinc" Removing the temp dirs from being created and added to systeminclude makes the command line short enough again that webkit can be compiled. Reviewed-By: Miikka Heikkinen Based on following commit from the no-tmp-dirs branch: commit 33e8c420bb40ca6194d29f96ef2fbd0f18340e6b Author: Iain <qt-info@nokia.com> Date: Wed Oct 7 13:45:48 2009 +0200 First attempt at removing the tmp dirs workaround on Symbian OS I may not have caught all the places where it is used, but MMP files look OK afterwards. TODO: Slightly concerned that I've trimmed too much from the abld generator as I think that the bit I cut was also used for other temp dirs
* | Added support for QT_*_STATICLIB variables in qmake.axis2009-12-111-6/+10
| | | | | | | | This is so that Symbian can have custom prefixes and extensions.
* | Switched to using ABIv2 format to generate Symbian binaries.axis2009-12-111-5/+1
| | | | | | | | | | This means using elf2e32 instead of elftran, and eliminates the need for generating exports manually.
* | Merge branch 'qmakeShlibFixes'axis2009-12-112-19/+50
|\ \
| * | Switched Symbian away from the Linux lib$(TARGET).4.6.0 naming schemeaxis2009-10-231-3/+21
| | |
| * | Added QMAKE_PREFIX_SHLIB and QMAKE_SYMBIAN_SHLIB support.axis2009-10-231-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | The first enables you to use a prefix in front of the library. It is by default enabled for all platforms which previously used "lib", and on Symbian it is set to the empty string. The second variable enables Symbian style linking, where you link to a stub .lib file, but the actual runtime library is .dll.
* | | Disable the forced profile recursion on Qt's Symbian build system.axis2009-12-111-2/+3
| | | | | | | | | | | | This makes configure a lot faster.
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-061-2/+42
|\ \ \ | |/ / |/| / | |/
| * Initial LFLAGS support for qmake on Symbian OSIain2009-11-051-2/+42
| | | | | | | | Reviewed-by: Shane Kearns
| * Revert "Switch from *-armv5 to *-armv6."Frans Englich2009-10-212-6/+6
| | | | | | | | | | | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings.
| * Switch from *-armv5 to *-armv6.Frans Englich2009-10-212-6/+6
| | | | | | | | | | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron
* | Made qmake support mkspecs under the symbian directory.axis2009-10-231-3/+6
| |
* | Fix symbian builds on Linux.Simon Hausmann2009-10-232-2/+3
| | | | | | | | | | Avoid the use of cmd.exe syntax through the use of Option::shellPath instead of isForSymbian() in qmake.
* | Enabled Symbian scope when compiling with linux-armcc.axis2009-10-231-1/+4
|/ | | | Based on a patch by Simon Hausmann.
* Ensure qmake does not lose the error code when going over the subdirsAndy Shaw2009-10-203-7/+18
| | | | | | | | | | When qmake was ran with -r over a subdirs project then it would lose the error code if a later project succeeded. This is a refix of the previous revert which has been confirmed to work all over the place now. Reviewed-by: Marius Storm-Olsen
* Refactored SymbianSubdirsMetaMakefileGenerator out of qmake.Miikka Heikkinen2009-10-163-346/+69
| | | | | | | | | There was no need to have SymbianSubdirsMetaMakefileGenerator in cross-platform metamakefile.cpp, so moved the Symbian specific functionality to symmake.cpp as suggested by qmake reviewers. Task-number: QT-822 Reviewed-by: Janne Anttila
* Enable overriding TARGETTYPE and OPTION statements with MMP_RULESMiikka Heikkinen2009-10-022-19/+58
| | | | | | | | | If MMP_RULES contains TARGETTYPE or any OPTION statements, default values for these will not be added to MMP file. This allows for example conditional OPTIONs and using native PLUGIN target type using MMP_RULES. Task-number: QT-2229 Reviewed-by: axis
* Revert "qmake - add error message if files for deployment are missing"Joerg Bornemann2009-10-011-8/+2
| | | | | | | | | This reverts commit aed3faca7dafdc697402cfc99dc5e9ad2fcbdd45. Using wildcards in the DEPLOYMENT variable like in tests/auto/qpixmap/qpixmap.pro was completely broken. Additional gimmick: replaced hand-crafted string chopping with QString::chop(1).
* Support for generating OPTION GCCE from QMAKE_CXXFLAGS.GCCEShane Kearns2009-09-221-3/+21
| | | | | | | Added GCCE as a compiler in SymbianMakefileGenerator::writeMmpFileCompilerOptionPart Task-number: QT-1163 Reviewed-by: axis
* Fix qmake pkg file generator to respect a drive specified for binariesShane Kearns2009-09-221-2/+7
| | | | | | | | | | | | The target path for binaries (.path configuration) in the DEPLOYMENT section of a .pro file now works for binaries as well as for resources. Path on device is still forced to /sys/bin Default path is still !:/sys/bin This can be used to force a binary to be installed on system drive by setting the path to "c:/sys/bin" or "$:/sys/bin" (for S60 3.2+) Reviewed-by: Iain
* Update license headers again.Jason McDonald2009-09-0949-196/+196
| | | | Reviewed-by: Trust Me
* Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_*Janne Anttila2009-09-034-25/+25
| | | | | | Renaming done based feedback. Reviewed-by: TrustMe
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-319-117/+117
| | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-07-20 05:40:42 (GMT)