summaryrefslogtreecommitdiff
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Nokia corp to Digia Plc and contact info changesjutaipal2012-12-053-5/+5
|
* Change copyrights from Nokia to Digia.Marko Valtanen2012-11-3053-1215/+1268
|
* qmake: introduction of QMAKE_PROJECT_NAMEJoerg Bornemann2012-01-312-3/+8
| | | | | | | | With this variable one can set the project name for IDE project files. Currently only used for Visual Studio Task-number: QTBUG-3206 Reviewed-by: ossi
* Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2011-11-071-0/+1
| | | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Merge-request: 1452 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
| | | | | | | | | | | | | In Symbian, when parsing .ts files for deployment localization, qmake would break if there was any translation using lengthvariants inside QtApplicationCaptions context. Technically this is legal though QtApplicationCaptions context is only meant for application captions and we don't support lenghtvariants for the actual captions themselves. Changed parsing so that any child elements on translations are simply skipped instead of causing parsing errors. Task-number: QT-5169 Reviewed-by: Guoqing Zhang
* Update licenseheader text in source filesJyri Tahtela2011-05-1353-901/+901
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-061-1/+1
| | | | | Task-number: QTBUG-18436 Reviewed-by: joerg
* look for makespec in the build dir firstOswald Buddenhagen2011-04-121-3/+3
| | | | | | | | | | | | | it's more natural to look into the build dir before the source dir, and it's what the qmake-generated makefiles mean when re-invoking qmake. specifically, this works around the problem that relative paths with excess ".."s pointing below the root are happily ignored and thus truly bizarre makespec paths may be constructed by the qmake re-invocations if the source dir is less nested than the build dir. Task-number: QTBUG-9817 Reviewed-by: mariusSO
* make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | | | | | | de-duplicate code, and on the way don't try to re-resolve project variables of subprojects against the contents of the top level project. Reviewed-by: mariusSO
* run depend_command in build dir in VS generators as wellOswald Buddenhagen2011-04-124-4/+18
| | | | | | followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61 Reviewed-by: mariusSO
* fixify target source against build treeOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | that's where one would expect a target, after all. affects only extra targets explicitly requesting fixification, i.e., nothing. Reviewed-by: mariusSO
* fix fixifying of QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-6/+10
| | | | | | | use the correct bases. notably, don't expect the input file in the output dir. Reviewed-by: mariusSO
* dist target: fixify OBJECTS_DIR against output dirOswald Buddenhagen2011-04-121-1/+2
| | | | | | the thing is terminally broken anyway, but whatever Reviewed-by: mariusSO
* fix paths of vpath-resolved filesOswald Buddenhagen2011-04-121-4/+3
| | | | | Task-number: QTBUG-8169 Reviewed-by: mariusSO
* simplify: absolute fixification ignores the base dir argumentsOswald Buddenhagen2011-04-121-1/+1
| | | | Reviewed-by: mariusSO
* simplify: fileFixify for all same paths is always "."Oswald Buddenhagen2011-04-121-3/+1
| | | | | | this must have been the most arcane way to generate a single dot ever Reviewed-by: mariusSO
* simplify: the input and output dirs are already normalizedOswald Buddenhagen2011-04-121-1/+1
| | | | Reviewed-by: mariusSO
* stop fixifying after first successOswald Buddenhagen2011-04-121-0/+1
| | | | | | | somewhat unlikely that this had much real-world effects ... except eating yet more cpu. Reviewed-by: mariusSO
* create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| | | | Reviewed-by: mariusSO
* useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-123-1/+16
| | | | Reviewed-by: mariusSO
* prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"Oswald Buddenhagen2011-04-121-7/+7
| | | | | | | that way prf files don't have to check both the prefix and the actual template to identify visual studio mode. Reviewed-by: mariusSO
* win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-043-3/+3
| | | | | | | | | | | | | | | On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove redundand validateModes() callOswald Buddenhagen2011-03-211-1/+0
| | | | i added another one a few lines above ...
* Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-145-29/+102
|\ | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * Fixed win32-msvc2008 build regression.axis2011-03-042-9/+5
| | | | | | | | | | | | | | | | We needed to move the code in the init() function to the fixTargetExt() function, which is where the variables are actually used. The reason is that fixTargetExt() runs before init(). RevBy: Miikka Heikkinen
| * Made qmake strip trailing \ from libdirs.axis2011-03-041-1/+4
| | | | | | | | | | | | | | This was done because trailing \ would confuse the command line parser if the path was also quoted. RevBy: Oswald Buddenhagen
| * Added MinGW support for adding lib prefix and extension via profile.axis2011-03-043-9/+19
| | | | | | | | RevBy: Oswald Buddenhagen
| * Added support for various special compiler/linker flags on MinGW.axis2011-03-041-0/+18
| | | | | | | | | | | | | | | | This enables you to use QMAKE_xxx_yyy, where xxx is either CFLAGS, CXXFLAGS or LFLAGS, and yyy is either APP, SHLIB or PLUGIN. It is basically the same as the one in the UNIX generator. RevBy: Oswald Buddenhagen
| * Added support for rvct_linker config in qmake's MinGW generator.axis2011-03-041-3/+11
| | | | | | | | RevBy: Trust me
| * Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | | | | | | RevBy: Trust me
| * Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-0/+6
| | | | | | | | | | | | | | This is just a mirror of the way the UNIX generator does it. See commits aaf189b084f52 and bdff51768dfe. RevBy: Oswald Buddenhagen
| * Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-8/+38
| | | | | | | | RevBy: Oswald Buddenhagen
| * Added Symbian makefile building support using MinGW backend.axis2011-03-042-3/+5
| | | | | | | | RevBy: Oswald Buddenhagen
| * Added Symbian deployment localization for makefile build system.axis2011-03-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
* | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-091-1/+4
| | | | | | | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
* | fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is usedOswald Buddenhagen2011-03-021-2/+2
| | | | | | | | | | | | | | | | | | don't insert an empty line between the command sets. this is needed for building sdk packages with breakpad support (which we want to do), so i'm defining it to be P1. Reviewed-by: mariusSO
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-221-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for QMAKE_CLEAN in symbian-sbsv2 Only add NetworkServices capability automatically if no caps are set.
| * | Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-211-0/+12
| |/ | | | | | | | | | | | | | | Files specified in QMAKE_CLEAN variable will now be properly cleaned in symbian-sbsv2 builds. Task-number: QTBUG-17004 Reviewed-by: Janne Koskinen
* | complain about unmatched quotes/parensOswald Buddenhagen2011-02-031-1/+12
| | | | | | | | | | | | | | | | using WarnDeprecated instead of WarnParser is a bit backwards, but we need something which is on by default and i don't feel like introducing a second parser warning mode for that. Reviewed-by: mariusSO
* | use const refOswald Buddenhagen2011-02-031-1/+1
| | | | | | | | Reviewed-by: mariusSO
* | move multiple inclusion check for feature files to correct locationOswald Buddenhagen2011-02-031-3/+3
|/ | | | | | | | | | previously, features specified with an absolute path would not be covered by the multiple inclusion guard, unlike the one specified just by a name. this is of theoretical value only, as nobody specifies features via absolute path anyway ... Reviewed-by: mariusSO
* Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-281-1/+3
| | | | | | | Mif file cleaning was incorrectly done at distclean phase. Task-number: QTBUG-16893 Reviewed-by: axis
* No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-273-24/+31
| | | | | | | | | | | | | There is no fundamental reason to not have dash or dot in binary names in Symbian, so do not replace them with underscore. One thing that doesn't work with a dot in the filename is launching an application via resources, so automatic resource generation is suppressed for applications that have a dot in filename portion of the TARGET value. Task-number: QTBUG-16888 Reviewed-by: axis
* Fix QMAKE_POST_LINK in Symbian for targets with special characters.Miikka Heikkinen2011-01-251-1/+1
| | | | | | | | | Proper fixed targets was not used to generate the dependency for QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen before actual linking. Task-number: QTBUG-16881 Reviewed-by: axis
* Fixed UTF-8 application names in device application menu in SymbianMiikka Heikkinen2011-01-241-0/+1
| | | | | | | | | CHARACTER_SET UTF8 statement was missing from generated .rss file, causing localized application names containing UTF-8 characters to be rendered incorrectly. Task-number: QT-4476 Reviewed-by: axis
* Improved QMAKE_POST_LINK support in symbian-sbsv2Miikka Heikkinen2011-01-201-22/+34
| | | | | | | | | | | | QMAKE_POST_LINK value handling now uses the same automatic replacements as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling. In practice this means that it is now possible to use $$QMAKE_COPY and friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and that any backslashes in the value are assumed to be path separators and will be converted to forward slashes. Task-number: QTBUG-16753 Reviewed-by: Janne Koskinen
* Remove toolcheck from generic clean targets for symbian-sbsv2Miikka Heikkinen2011-01-181-3/+5
| | | | | | | | | | | Toolcheck can cause generic clean fail (i.e. "make clean" or "make debug-clean") for e.g. environments where Carbide command line tools have not been installed, because sbsv2 toolchain does a check for all tools related to target platforms, even though they are not needed for actual cleaning. Task-number: QTBUG-16691 Reviewed-by: Janne Koskinen
* make sure Option::dir_sep is initialized in timeOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | querying $$DIR_SEPARATOR (possibly indirectly via $$QMAKE_DIR_SEP) may happen before querying any os scopes, so better make it initialize the host mode explicitly. loading features theoretically needs an initialized dir_sep as well (to detect relative paths), so take care of that as well. Task-number: QTBUG-10633 Reviewed-by: mariusSO
* Update copyright year to 2011.Jason McDonald2011-01-1153-53/+53
| | | | Reviewed-by: Trust Me
* Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| | | | | | | Make it possible to freeze def files via makefile targets. Task-number: QTBUG-13769 Reviewed-by: Janne Koskinen
View Lorry Controller Status