summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-152-14/+79
|\ | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Support for adding user specified list type content in rss fileMiikka Heikkinen2010-03-112-14/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the following RSS_RULES variables to improve control over placement of user defined rules inside application registration resource file: RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item in the service_list of APP_REGISTRATION_INFO RSS_RULES.file_ownership_list - Rule placed inside a FILE_OWNERSHIP_INFO item in the file_ownership_list of APP_REGISTRATION_INFO RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the datatype_list of APP_REGISTRATION_INFO Task-number: QT-3083 Reviewed-by: Janne Anttila
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-1/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-011-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QHostInfo: Forgot to free some stuff on application exit. Readd a line that got removed by accident in previous change Ensure that a library path with a space in it gets quoted on Windows
| | * Readd a line that got removed by accident in previous changeAndy Shaw2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | A line got removed by accident in the change f3af7b746221cb44899f3e433659791f75255f21, this patch readds it back. Reviewed-by: TrustMe
| | * Ensure that a library path with a space in it gets quoted on WindowsAndy Shaw2010-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was not happening when -L and -l was used and the path specified with -L was quoted. It would lose the quotes when combining it to get the full path for the library it found. Task-number: QTBUG-2433 Reviewed-by: Marius Storm-Olsen
| * | Added .condition modifier to SUBDIRS.Miikka Heikkinen2010-03-011-1/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, it is now possible to set certain subdirs to be built only when specified define is true when bld.inf is parsed. For example, compile a subdir only when building for emulator: SUBDIRS += winscw_lib winscw_lib.condition = WINSCW Also improved SUBDIRS variable documentation; the modifiers were completely undocumented. Task-number: QT-3017 Reviewed-by: axis
* | qmake/MinGw: Link statically for Qt Creator to be able to detect it.Friedemann Kleint2010-03-042-2/+2
| | | | | | | | | | | | | | | | | | Qt Creator detects Qt versions by running qmake. This fails if no MinGw setup is in the path as is usually the case when starting it from the menu. Make it possible to run qmake without setup. Strip executable. Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> Reviewed-by: mariusSO <qt-info@nokia.com>
* | fix qmake -project modeOswald Buddenhagen2010-03-031-0/+11
| | | | | | | | | | | | | | the mode is a big hack, and consequently needs hacks to get started as well ... Reviewed-by: mariusSO
* | don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-0310-25/+12
| | | | | | | | Reviewed-by: mariusSO
* | make the fallback value of QMAKE_QMAKE absoluteOswald Buddenhagen2010-03-031-1/+2
| | | | | | | | | | | | | | | | inspired by the pbx generator. currently this has no effect, as all generators build their own fallbacks anyway. Reviewed-by: mariusSO
* | make the value of QMAKE_QMAKE somewhat less magicOswald Buddenhagen2010-03-021-1/+0
| | | | | | | | | | | | | | | | | | the generators change the value of QMAKE_QMAKE, so it is unwise to "redirect" it to a hidden builtin which is reset each time. in particular, this fixes qmake generating makefiles without an absolute path to qmake itself - the initial quoting of the filename will make the variable "real", so contains() will start working for it.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-2613-154/+230
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...
| * \ Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-262-1/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: configure.exe
| * | | Get qmake to add pdb files to install target in debug configuration.Sean Harmer2010-02-262-0/+18
| | | | | | | | | | | | | | | | | | | | Merge-request: 2105 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | give symbian an own platform modeOswald Buddenhagen2010-02-266-91/+19
| | | | | | | | | | | | | | | | | | | | | | | | ... instead of using the gross isForSymbian() magic Reviewed-by: mariusSO
| * | | deprecate -win32/-unix/-macx which set both host and target modeOswald Buddenhagen2010-02-261-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | decouple host platform mode from target platform modeOswald Buddenhagen2010-02-268-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | derive the host mode from the generator - this doesn't work *too* well if the mode is different from the real host platform, so it's only for testing. get the target platform mode from the qmakespec, falling back to the host platform mode. Reviewed-by: mariusSO
| * | | factor out applyHostMode()Oswald Buddenhagen2010-02-262-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | more preparation work for delayed mode determination ... Reviewed-by: mariusSO
| * | | make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtinsOswald Buddenhagen2010-02-261-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this will allow setting their actual value depending on a delayed determination of the platform. Reviewed-by: mariusSO
| * | | use QDir::separator() instead of Option::dir_sep where appropriateOswald Buddenhagen2010-02-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in these cases, the separator depends on the *real* host platform, not on the one that will host the build. there are many more cases like that, but that's for (much) later ... Reviewed-by: mariusSO
| * | | simplify string opsOswald Buddenhagen2010-02-261-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | sanitize evaluation of OS scopesOswald Buddenhagen2010-02-261-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is marginally behavior-incompatible in that adding the name of an OS scope to CONFIG will not make it true any longer. the cleaned up semantics (besides having merit by themselves) will enable optimizations. Reviewed-by: mariusSO
| * | | instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-261-4/+0
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-266-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is the same as specifying -r on the command line, but it can be set in pro and spec files for cases where no recursion would plain not work. the implementation is via a new option() instruction which at some point will be used to set other "modes of operation" as well. for now, only the "recursive" option is recognized. Reviewed-by: mariusSO
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-268-121/+183
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
| * | | Merge branch '4.6'Miikka Heikkinen2010-02-261-5/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * | Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULESMiikka Heikkinen2010-02-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is necessary to specify this variable conditionally sometimes, which requires use of MMP_RULES, so allowed overriding it without warning. Task-number: QT-2909 Reviewed-by: Janne Koskinen
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-268-116/+178
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | * Fix SymbianMakefileGenerator::absolutizePath for clean buildsMiikka Heikkinen2010-02-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileInfo::isDir() will not return correct value if path doesn't exist like it doesn't in case of clean builds. Turned the check around and used isFile() instead. If a file is given as origPath, it is assumed to exist, because it was explicitly given with HEADERS variable and qmake will give warning if nonexisted file is given there. Reviewed-by: Janne Koskinen
| | * Misc fixes to FLM filesMiikka Heikkinen2010-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) FLMs should not have more than one phase dependency -> removed extra dependencies, leaving only what is actually necessary. 2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete 3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm so that unrelated components can continue building instead of halting the whole build at EXPORT phase. 4) Added .export to qmake_extra_pre_targetdep interface so that it is actually executed in EXPORT phase where it should be. Task-number: QTBUG-8513 Reviewed-by: Janne Koskinen
| | * Fix extensions section in bld.inf when CONFIG contains symbian_testMiikka Heikkinen2010-02-244-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | Prj_extensions tag is replaced with prj_testextensions tag when CONFIG contains symbian_test Task-number: QT-2985 Reviewed-by: Janne Koskinen
| | * Basic deployment support for ROM in SymbianMiikka Heikkinen2010-02-247-84/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy everything currently deployed under /epoc32/winscw/c to also under /epoc32/data/z to make is easier to deploy applications to ROM. Also changes path separators in deployment generation to be Linux friendly. Reviewed-by: Janne Anttila
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-222-23/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed canonical paths to absolute paths in symmake. Don't use vgClear() for semi-transparent brushes.
| | | * Changed canonical paths to absolute paths in symmake.Miikka Heikkinen2010-02-222-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canonical paths were resolving to empty if the paths didn't exist, which causes problems for clean platform builds. Using absolute paths instead will generate all required paths. This will cause a minor inconvenience of warnings about some nonexistent paths during makefile generation phase of abld builds, but this is unavoidable. Sbsv2 builds do not display any warnings. Reviewed-by: Janne Anttila
| | * | Fixed shadow builds on Unix.Rohan McGovern2010-02-221-1/+1
| | |/
* | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-242-1/+5
|/ /
* | Fixed shadow builds on Unix.Rohan McGovern2010-02-231-1/+1
| |
* | Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-231-2/+0
| | | | | | | | | | | | | | Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o and epocroot.o respectively to be included twice during the linkage step of qmake/Makefile.unix. (cherry picked from commit 480f3df2eab9ad13e0d7ea1245158866a0b942bd)
* | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-2312-151/+40
| | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen (cherry picked from commit 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7)
* | Factored readRegistryKey implementation out of qmakeaxis2010-02-237-100/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen (cherry picked from commit 5254184c07b4da800e29000a251ed2a026bd2be5) Conflicts: qmake/Makefile.unix
* | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-217-33/+100
| | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. Conflicts: qmake/Makefile.unix
* | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2112-45/+151
| | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
* | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-2014-249/+70
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2014-248/+69
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| | * Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-191-2/+0
| | | | | | | | | | | | | | | | | | Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o and epocroot.o respectively to be included twice during the linkage step of qmake/Makefile.unix.
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1912-151/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-197-100/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
| | * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-197-34/+100
| | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
| | * Revert "Factored epocRoot implementation out of qmake"axis2010-02-1912-40/+151
| | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
generated by cgit v0.12 at 2024-12-30 19:50:03 (GMT)