summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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.
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1812-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-187-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
| * | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| | * Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We should always use forward slash as a directory separator in include paths - it's not OS dependant. Task-number: QTBUG-8308 Reviewed-by: Alessandro Portale
* | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-195-134/+0
|/ / | | | | | | | | | | | | | | | | This was done in order to use the same targets for multiple mkspecs. The "store_build" target of sbsv2 had to remain separate, because it depends on using flms. RevBy: Miikka Heikkinen
* | Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-1616-1420/+23
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1316-1420/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-121-5/+1
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | littering generic makefile generator code with it is both plain ugly and unnecessary. Reviewed-by: mariusSO
| | * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-128-1356/+6
| | | | | | | | | | | | | | | | Acked-by: mariusSO
| | * | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | | | | | | | | | | | | | | | Reviewed-By: mariusSO
| | * | simplifyOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | no need to recalculate a value which we have an own variable for Reviewed-By: mariusSO
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-4/+30
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-123-7/+44
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-9/+72
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-4/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | qmake - add targets to wrapper make file make stub_sis createpackage - use -s or --stub to run makesis with the -s argument also copies the file to the right place in epoc32\data\system\installs qt.iby - add qt_stub.sis and qt_webkit_stub.sis Task-number: QTBUG-6570 Reviewed-by: Miikka Heikkinen
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-091-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed some global QIcon/QPixmap instances that leaked handles on X11. Speed up QListView test QListView: fix crash when hiding many of the lasts item in a QListView Fixed warnings and crash when painting graphics effects outside scene. Stabilize QLineEdit test on X11 (sqlite) Allow shared cache mode Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant. Fixed bug where GL widget was not fully updated on Vista.
| | * Make generate uid3 (symbian) work on 64 bit host platform.Thomas Zander2010-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On a 64 bit system the old code used to make; UID "0xEffffffff9d8cb14". Which doesn't get accepted by the symbian tool chain ;) The patch makes this normal size hex uid3 again. Reviewed-by: Miikka Heikkinen
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-091-2/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting some parameters to reliably run on Tb9.2, Streamlined smart installer package creation in Symbian
| | * | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-091-2/+33
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added make target for creating smart installer packages - Application sis is automatically generated if missing when "make installer_sis" is invoked - No need to specify installer pkg UID if self signing is enough - Related docs fixed - Fixed smartinstaller.sis name to be correct Task-number: QTBUG-8026 Reviewed-by: axis
| * | Added QMake directory to INCPATH so the compiler can find required headersConstantin Makshin2010-02-081-4/+10
| |/ | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-17/+69
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-051-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Another fix for the non unified title+toolbar regarding text under icons My 4.6.2 changes Added my changes to changes file. Doc: Correcting image My changes for 4.6.2 My changelog for 4.6.2 My Changelog entries for 4.6.2 Add the QMAKE_FILE_EXT variable to extra compilers generation. Doc: Removed promisse to fix a problem Add some entries to the change log Change log updated Improve raster graphics system performance on Mac (second try). I10n/German: Update translations for 4.6.2 I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
| | * Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | This give the possibility to get the file name with the extension and without the path. Reviewed-by: Joao Reviewed-by: Marius Storm-Olsen
generated by cgit v0.12 at 2025-01-29 03:41:31 (GMT)