summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-137-77/+201
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Make bld.inf target in Symbian mkspecs to depend on .pro fileMiikka Heikkinen2010-08-122-8/+15
| | | | | | | | | | | | | | | | Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns
| * Gcce building support for symbian-sbsv2Miikka Heikkinen2010-08-112-40/+143
| | | | | | | | | | | | | | | | | | It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron
| * Rename Symbian generated mmp/mk files to include target in filenameMiikka Heikkinen2010-08-064-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | Mmp and mk files previously contained UID3 as unique identifier in the filename. However, this was not particularly useful for building subprojects in massive project trees such as Qt, as it was difficult to remember UID for each subproject. Now with intuitive naming of mmps, it is possible to build a subproject like this: sbs -c armv6_urel -p qtcore_dll.mmp Task-number: QTBUG-12715 Reviewed-by: Jason Barron
| * Fix package header in cases where VERSION doesn't contain all valuesMiikka Heikkinen2010-08-041-2/+24
| | | | | | | | | | | | | | | | Missing minor or patch value from VERSION caused malformed pkg header to be generated. Task-number: QTBUG-12617 Reviewed-by: axis
* | qmake vcproj generator cleanupJoerg Bornemann2010-08-101-15/+11
| | | | | | | | | | | | | | | | | | | | | | MSVCPROJ_CXXFLAGS removed. This was unused. MSVCPROJ_LFLAGS removed. This was used to convert the values of QMAKE_LFLAGS, QMAKE_LIBDIR and DEF_FILE to linker command line options. Then they were converted back to set values in the object model. This journey to the world of command line options isn't necessary... Reviewed-by: ossi
* | qmake: repair .vcxproj generationJoerg Bornemann2010-08-103-15/+17
| | | | | | | | Rubber-stamped-by: ossi
* | qmake: move .vcproj XML generation from data classes to VCProjectWriterJoerg Bornemann2010-08-102-203/+189
| | | | | | | | Rubber-stamped-by: ossi
* | qmake: remove duplicated code from VcxprojGeneratorJoerg Bornemann2010-08-103-595/+28
| | | | | | | | Rubber-stamped-by: ossi
* | qmake: duplicated code removed from msbuild_objectmodel.cppJoerg Bornemann2010-08-106-2638/+1060
| | | | | | | | Rubber-stamped-by: ossi
* | qmake: move XML generating code from data classes to VCXProjectWriterJoerg Bornemann2010-08-103-497/+431
| | | | | | | | Rubber-stamped-by: ossi
* | qmake vcxproj generator: introduce VCXProjectWriterJoerg Bornemann2010-08-107-574/+585
| | | | | | | | Rubber-stamped-by: ossi
* | qmake vcproj generator: introduce VCProjectWriterJoerg Bornemann2010-08-104-397/+398
| | | | | | | | | | | | XML stream operator code moved to VCProjectWriter. Rubber-stamped-by: ossi
* | qmake: fix misuse of static_cast in msvc_vcproj.cppJoerg Bornemann2010-08-101-2/+7
| | | | | | | | Reviewed-by: ossi
* | qmake: remove some old .dsp related code from .vcproj generatorJoerg Bornemann2010-08-102-81/+28
| | | | | | | | | | | | | | | | | | | | | | | | Removal of the following variables: MSVCPROJ_VERSION, MSVCPROJ_PROJECT, MSVCPROJ_TEMPLATE, MSVCPROJ_CONSOLE, MSVCPROJ_WINCONDEF, MSVCPROJ_VCPROJTYPE and MSVCPROJ_SUBSYSTEM. Apart from MSVCPROJ_WINCONDEF none of these variables were in use. MSVCPROJ_WINCONDEF was used to add the _WINDOWS define if CONFIG contained "windows". The _CONSOLE define was never added. Reviewed-by: ossi
* | qmake: remove Windows CE stuff from .vcxproj generatorJoerg Bornemann2010-08-103-149/+4
| | | | | | | | | | | | VS2010 does not support Windows CE. Reviewed-by: ossi
* | qmake: remove VS2003 work-around from vcxproj generatorJoerg Bornemann2010-08-103-6/+3
| | | | | | | | | | | | This generator is VS2010 only. Reviewed-by: ossi
* | qmake: no need to add the _WINDOWS define twiceJoerg Bornemann2010-08-102-12/+0
| | | | | | | | | | | | This is already done by MSVCPROJ_WINCONDEF. Reviewed-by: ossi
* | qmake: useless addition of the NDEBUG define removedJoerg Bornemann2010-08-102-4/+0
| | | | | | | | | | | | This already happens in initConfiguration. Reviewed-by: ossi
* | qmake: don't add QT_NO_DEBUG in msvc generatorsJoerg Bornemann2010-08-102-6/+2
| | | | | | | | | | | | This is already done in qt.prf. Reviewed-by: ossi
* | qmake msvc generator: remove unneeded handling of variablesJoerg Bornemann2010-08-102-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | win32/thread.prf takes care of handling the following variables: MAKE_CXXFLAGS_MT_DLLDBG MAKE_CXXFLAGS_MT_DBG MAKE_CXXFLAGS_MT_DLL MAKE_CXXFLAGS_MT No need to do that in the MSVC generators. It was incorrectly implemented anyway. Reviewed-by: ossi
* | qmake: qmakeDeleteCacheClear() function can be template nowminiak2010-08-034-11/+8
|/ | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* run dep commands in build dirOswald Buddenhagen2010-07-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the file names are given relative to the build directory, so the command needs to be run in it as well. this is a more expected (and simpler) fix than the alternative, which would be giving file names relative to the source directory. reasons not to fix: - due to some other bug, the problem really affects only builds where the build dir is not at the same level as the source dir - otherwise, absolute paths would be passed anyway - it has some breakage potential for the cases where the commands actually expect being run in the source dir - it can be worked around by manually injecting the cd statement into the command reasons why i still fixed it: - it doesn't affect in-source builds, and it seems that most complex build systems (which would define custom compilers with depend_command) don't support shadow builds anyway - people who needed things to work probably already used $$OUT_PWD somehow (either a "cd" at the start, or prepending it to each path), so this change will be practically a no-op - "it's just dependencies, and these are known to be broken in qmake anyway" Reviewed-by: joerg Task-number: QTBUG-1918
* Fixed pre-built resources deployment in SymbianMiikka Heikkinen2010-06-301-0/+14
| | | | | | | Pre-built resources didn't get properly copied under \epoc32\data\z. Task-number: QTBUG-11519 Reviewed-by: Janne Koskinen
* qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.Jocelyn Turcotte2010-06-244-6/+4
| | | | | | | | | | | The previous patch caused the pch header to be compiled without exception handling since the compilertool for the pch compilation do not get its options filled from the compiler flags. This patch instead set the value to off before calling parseOptions. This also reverts commit 73fa311f67b21c9b897de0196d3b8227f27d828f. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't remove the path from the name of included filesOswald Buddenhagen2010-06-231-1/+0
| | | | | | | | it is not done for the top-level file, either. this is minimally behavior-incompatible, but anyone relying on the old behavior (and thus not using $$basename()) should be shot anyway. :) Reviewed-by: joerg
* add some commentsOswald Buddenhagen2010-06-231-2/+2
|
* remove support for QMAKE_POST_INCLUDE_FILESOswald Buddenhagen2010-06-232-11/+1
| | | | | | | google has no mention of it except for a single orphaned instance in our own source code => trash. Reviewed-by: joerg
* remove unused functionOswald Buddenhagen2010-06-231-4/+0
|
* fix prompt() stdin safety checkOswald Buddenhagen2010-06-231-1/+1
| | | | Reviewed-by: joerg
* Fix precompiled binary deploymentMiikka Heikkinen2010-06-221-25/+28
| | | | | | | | Precompiled binaries were not copied under /epoc32/data/z to support deployment properly. Task-number: QTBUG-11519 Reviewed-by: Janne Koskinen
* qmake: Fix CONFIG += exceptions_off with the MSVC project generator.Jocelyn Turcotte2010-06-162-2/+6
| | | | | | | | | | | | | | | | | | cl.exe default exception handling (when not specified on the command line) is to disable exceptions. In vcproj files however, if the ExceptionHandling option is not specified, the default behavior is to enable exceptions without SEH (/EHsh). This patch makes sure that ExceptionHandling is disabled when /EHsc is not fed to parseOption (which happens when the exceptions_off config is encountered). For VS2003 the values are a bit different where "false"==ehNone, "true"==ehNoSEH and ehSEH is not available. The default is "true" if not specified thus why we set it to "false" when exceptions_off is given. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-153-3/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits) Use native locale aware string comparison on Symbian. Temporary fix for regression in QSslCertificate::fromPath() doc: Added more DITA output to the XML generator Fix symbian building of TARGET with a slash Fix a minor typo in QAbstractItemModel's documentation. QXmlSchema: allow usage of xsd:all QSslSocket: fix build for MinGW and VS 2005 Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-123-3/+17
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else" Updated leading whitespace to make indentation more consistent Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms. make postgresql support sensitive to PSQL_LIBS support for cross building Qt for MinGW (win32-g++) on Unix use "win32-g++*" scope to match all MinGW makespecs Demos: Fix compilation with namespace. ...
| | * support for cross building Qt for MinGW (win32-g++) on UnixMark Brand2010-06-102-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset provides the basis for targetting win32-g++ on Unix using the configure shell script: support added to the configure script itself support added to relevant config.tests support added to mingw makefile generator in qmake new makespec: unsupported/win32-g++-cross The makespec is based on the win32-g++ makespec. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-152-4/+3
|/ / | | | | | | | | | | | | Since sbsv2 toolchain supports having sources and SDK on different drives, $${EPOCROOT} needs to contain drive letter to make it work. Reviewed-by: Jason Barron
* | Moved runonphone target to prf files for all build systems.axis2010-06-114-19/+0
|/ | | | | | This reduces code duplication. RevBy: Miikka Heikkinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-081-1/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change the directory where smart-installable application package is
| * Change the directory where smart-installable application package isMiikka Heikkinen2010-06-081-1/+1
| | | | | | | | | | | | | | | | | | For security reasons, it is better to install application packages into the private directory of the smart installer rather than a public directory. Task-number: QTBUG-11288 Reviewed-by: Aleksandar Sasha Babic
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-3/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * support TARGETs with spacesOswald Buddenhagen2010-06-031-3/+3
| | | | | | | | | | | | | | this is quite a hack, but the quoting is terminally broken anyway, so ... Task-number: QTBUG-10384
| * qmake: don't warn about unknown MSVC compiler option /MPJoerg Bornemann2010-06-021-0/+6
| | | | | | | | | | | | | | | | VCCLCompilerTool didn't know about the /MP option, which is available since Visual C++ 2005. Task-number: QTBUG-3252 Reviewed-by: ossi
* | Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-045-37/+40
| | | | | | | | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
* | escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
| | | | | | | | | | | | they may contain (absolute) windows paths, which need escaping now. Reviewed-by: mauricek
* | complain about unescaped backslashesOswald Buddenhagen2010-05-262-0/+7
| |
* | clarify wording of warning messageOswald Buddenhagen2010-05-201-1/+1
| | | | | | | | Reviewed-by: joerg
* | close scope while inside assignment only if the last char is a closing braceOswald Buddenhagen2010-05-201-1/+1
| | | | | | | | | | | | the code assumed it anyway and would make a mess if it was wrong Reviewed-by: joerg
* | deprecate undocumented -E optionOswald Buddenhagen2010-05-201-0/+1
| | | | | | | | Reviewed-by: joerg
* | unify QMAKE_QMAKE path separator fixingOswald Buddenhagen2010-05-202-8/+6
| | | | | | | | | | | | | | | | | | | | | | the value of the variable in Option is only ever accessed via the project variable, so there is no point in early fixing. as it happens, this fixes mingw+sh generating makefiles with the wrong separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was read back into Option. Reviewed-by: joerg
generated by cgit v0.12 at 2024-09-26 23:25:01 (GMT)