summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix qmake evaluation of QMAKE_TARGET.arch on msvc2010 x86_64Giotis Nikos2012-02-091-2/+8
| | | | | | | | | | | | This change is needed because msvc2010 tools have a '\' character at the end of environment variable VCINSTALLDIR. This variable on msvc2008 does not have this '\' character at its end. Without this change QMAKE_TARGET.arch on msvc2010 x64 evaluates to x86 instead of x86_64. cherry picked from qtbase 66f56024ccfc39f818e0f16b44d4916b6a03d322 Task-number: QTBUG-22686 Change-Id: Ibc7546c522506b2c4e7a729a8de319aea788b662 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2012-02-071-0/+2
| | | | | | | | | | | 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 Change-Id: Ieb77530ca53c7e76056c18542a3bb7e2d3688d73 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Add support for XCode 4 into qmakeAndy Shaw2012-02-021-71/+172
| | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Escape path names in qmake-generated Makefiles.Andreas Hartmetz2012-01-311-1/+1
| | | | | | | | | | | | | qmake-generated Makefiles since 4.6 (according to bug report) contain recursive qmake invocations with absolute paths to .pro files, where the absolute paths are not escaped. This is a backport of ea2c9f764fed654a57972223449f41e208e05863 from qtbase master. Task-number: QTBUG-11776 Change-Id: If926fe4f2ee4c0e72e140c0fcc376e5a0fd20f21 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Symbian: qmake: Fix emulator deployment destinationsJaakko Helanti2012-01-172-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | This fix affects how qmake generates "bld.inf" file. Earlier, all emulator deployments went to epoc32/winscw/c, which is the C-drive of the emulator. However, emulator implementation expects often to find deployments from epoc32/release/winscw/udeb/z, which is the ROM drive of the emulator. For this reason many things, including QML deployments, did not work in the emulator. Now the fixed deployment is as follows: - If pro-file deployment has no path value, it goes to emulator ROM drive. - If pro-file deployment has path variable with no drive letter, it goes to emulator ROM drive. - If pro-file deployment has path variable with drive letter, it goes to the given emulator drive. - If pro-file deployment has path variable with '!' as drive letter, it goes to emulator C drive. When making emulator ROM-drive deployment, two deployments are made, one to udeb and one to urel emulator. Task-number: ou1cimx1#954237 Change-Id: I62d3f5b479ee0c0c547e824bb45ae8c0a6484d87 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1155-55/+55
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-01-061-0/+4
| | | | | | | | | For the debug configuration the optimization should be turned off. Reviewed-by: ossi Task-number: QTBUG-23421 Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e
* qmake: fix /MP option for VS 2010Joerg Bornemann2012-01-061-3/+3
| | | | | | | | | Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010. Task-number: QTBUG-23490 Reviewed-by: ossi Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
* Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERSMiikka Heikkinen2011-12-091-0/+4
| | | | | | | | | | | The case of the drive letter generated to the absolute paths seems to have changed between 4.7 and 4.8, which led into regression with projects that utilize $$PWD in target name, as that still returns the path with drive letter in same case as previously. Fixed the critical check to be case insensitive in windows. Task-number: ou1cimx1#951456 Reviewed-by: Murray Read
* Symbian: Fix language mappings for localize_deploymentMiikka Heikkinen2011-12-071-5/+10
| | | | | | | | Some Qt language codes now map to two Symbian language codes. Also added the missing en_in mapping. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Symbian: Only localize the application .rss that needs it, not all .rssMiikka Heikkinen2011-12-072-2/+1
| | | | | | | | | Move LANG statement into proper RESOURCE block inside generated .mmp file, so it doesn't affect _reg.rss, which doesn't need to be localized. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Windows: Add gcc 4.6.Friedemann Kleint2011-11-161-1/+1
| | | | | | | - Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6) - Add detection of g++ version and 64bit to configure. Reviewed-by: mariusSO
* Add INTEGRITY gbuild.* files to qmake project.Rolland Dudemaine2011-11-152-2/+5
| | | | | | | This allows building and debugging qmake from Qt Creator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use the project root from .gpj project files, instead of local path.Rolland Dudemaine2011-11-151-3/+5
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make sure QMAKE_CXX is defined to prevent crashing on some projects.Rolland Dudemaine2011-11-151-1/+3
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add support for .pro-type subdirectories.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add relative path to the work directory, to prevent filename clashes.Rolland Dudemaine2011-11-151-0/+4
| | | | | | | | This was causing issues for some examples, which are all consistently using main.cpp as the entry file. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Only call moc if the file needs it.Rolland Dudemaine2011-11-151-2/+3
| | | | | | | | | This applies to both headers and cpp files (use mocable()). Previously, moc was called on all cpp and h files, causing additional compilation time, and trouble on QSvgGenerator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use outname to specify the output .gpj to generate.Rolland Dudemaine2011-11-151-3/+3
| | | | | | | | | This resolves several path issues as well. outname itself is now based on the first TARGET file, instead of using the output filename. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use "dll" instead of "shared".Rolland Dudemaine2011-11-151-1/+1
| | | | | | | | | | For DLLs (which are not supported, but may be soon), use the CONFIG variable "dll" instead of the "shared" template, because some testcases actually use shared even when compiled statically. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Instead of translating / into _, check if subdir is a .pro.Rolland Dudemaine2011-11-151-2/+4
| | | | | | | | | | Previously, .pro files were treated as directories, and a previous workaround for the issue was to replace / with _ in directory paths. This was both actually non-sensical and not effective. This resolves the issue by checking if the subdir has a .pro extension. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Do not generate -D defines for project types.Rolland Dudemaine2011-11-151-1/+2
| | | | | | | | | | | Options are implicitly inherited from project to subprojects and applications, so there is no need to respecify them. Worse, if an app/lib disables an option, the project might still have the define enabled, forcing it also onto the app/lib. This prevents double-define or this kind of conflict. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Clean up generated linker file for the shared library case.Rolland Dudemaine2011-11-151-9/+11
| | | | | | | Generated linker file was not looking good, now much better. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make applications start by default (StartIt True).Rolland Dudemaine2011-11-151-0/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Change the overload from write() to writeMakefile() in INTEGRITY generatorRolland Dudemaine2011-11-152-2/+2
| | | | | | | | This way, INTEGRITY-specific generation is only called in Makefile mode. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-10-181-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake: fix writing of incremental linker option for vcxproj files
| * qmake: fix writing of incremental linker option for vcxproj filesJoerg Bornemann2011-10-141-1/+1
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-171-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (35 commits) runonphone timestamps nanosecond formating set to 9 chars, 0 padded Put Qt translation files to rom on Symbian. Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian Converting from double to qreal in gui Fix XML schema validation failure. Fix construction races in QtNetwork Removing accidental use of double instead of qreal from QLine Fix incorrect QFileInfo permissions on windows Converting accidental use of doubles to qreal in declarative Copy and Cut are not available for some QML editors Ignore CcpuCan calls if input context is being destroyed Remove one local variable from QCoeFepInputContext Symbian: Fix native dialog with splitscreen VKB focus loss issue Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication runonphone - Implement CODA autodetection Symbian: Parse ts filenames case-insensitively for localize_deployment Do not crash in copy() of pixmaps without an underlying bitmap QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8 symbian - document behaviour of QFile::handle() ...
| * \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-142-7/+3
| |\ \ | | |/
| * | Symbian: Parse ts filenames case-insensitively for localize_deploymentMiikka Heikkinen2011-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of platform applications have all-lowercase translation files due to file naming policies. This makes no difference for runtime translation, so removed unnecessary case sensitivity when parsing ts filenames for localization deployment. Task-number: QT-5305 Reviewed-by: Sami Merila
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-202-58/+5
| |\ \
* | | | support the obj-c #import statement in the dependency generatorOswald Buddenhagen2011-10-141-1/+2
| |_|/ |/| | | | | | | | | | | Task-number: QTBUG-21965 Reviewed-by: joerg
* | | Add -nn for .cpp MOC preprocessing for INTEGRITYRolland Dudemaine2011-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake generates .gpj project files for INTEGRITY. Calls to moc on headers or code that do not produce actual output cause a Note to be generated. This is considered as an error during build by the Green Hills gbuild build tool. -nn can be added to not generate that note when no output is generated. This was already done for headers in util/integrity/qt.bod, but it was not there yet for .cpp files. Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Remove commented out code.Rolland Dudemaine2011-10-121-7/+0
| | | | | | | | | | | | | | | Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | add integrity gbuild to the project file for convenienceOswald Buddenhagen2011-09-291-0/+2
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-201-35/+28
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| * Remove few unused variables.Miikka Heikkinen2011-09-061-2/+0
| | | | | | | | | | | | | | The languageAttribute and underscoreChar variables were not used in SymbianCommonGenerator::parseTsContent function, so removed them. Reviewed-by: TrustMe
| * Symbian: Detect app caption and pkg name translations by id attribute.Miikka Heikkinen2011-09-061-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To better support various localization tools, added an alternate way to detect application caption and package name translations in .ts files. Now in addition to specific source text the id attribute of the message element can be used to identify interesting translations. The ids qmake is looking for are: qtn_short_caption_<appname> qtn_long_caption_<appname> qtn_package_name_<appname> qtn_smart_installer_package_name_<appname> Task-number: QT-5247 Reviewed-by: Sami Merila
| * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-312-2/+2
| |\
* | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-101-56/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: find qt.conf more reliably
| * | | find qt.conf more reliablyOswald Buddenhagen2011-09-091-56/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | a qmake invoked with a relative path would not find qt.conf, because it already changed CWD, which would confuse our copy of QCoreApplication::applicationFilePath() (see also QTBUG-21381). we already have the absolute path to the qmake executable in Option::qmake_abslocation, so just use it.
* | | qmake vcxproj generator: fix XML conversion for build eventsJoerg Bornemann2011-09-081-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-20419 Reviewed-by: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-08-316-34/+34
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Symbian system date format parsing. Fix QXmlSimpleReader auto test failer Fix pointer event mapping when windows are fixed to native orientation Fix incorrect Symbian version check. Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds. Improved support for shadow builds in Symbian. Fix def file paths for Symbian shadow builds Giving QUuid::createUuid() more entropy on Symbian Enable running of XQuery test suite QXmlSimpleReader handle external entity reference file over 1k
| * Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-246-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* | Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
| | | | | | | | | | Merge-request: 2619 Reviewed-by: ossi
* | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
|/ | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| * 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
* | qsystemlibrary needs no special treatmentOswald Buddenhagen2011-06-241-3/+0
| | | | | | | | this was just a merge artifact
generated by cgit v0.12 at 2025-01-15 22:58:57 (GMT)