summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/qtpatchoperation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* fix missed patching step on macTim Jenssen2013-08-161-13/+91
| | | | | | | | - there was a problem if we have frameworks or libs with a different name than "/lib/Qt" for example phonon or libQtCLucene Change-Id: If1dec0dbeffa3d4d5a5a4e24e8d1b21e4b24f2c3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* fix argument check in QtPatchOperationTim Jenssen2013-06-251-2/+3
| | | | | Change-Id: I9220fec90df5b7dad2e49db90209e64bbc4fd8b2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* fix crash if core is not thereTim Jenssen2013-06-121-2/+2
| | | | | Change-Id: I2eaf6015c6bbc601338f94db0761ddd0016a8211 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* adding ConsumeOutputOperationTim Jenssen2013-06-031-21/+47
| | | | | | | | | | | - With that operation we can save the original qmake output, before the installer does the patching. So we can use the old values for modules patching if they will be installed later. - added a autotest which does that with the current used qmake Change-Id: Ie07d273bf64d1813b7af3374a0db35a9e1215503 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix QT_HOST_LIBS qmake patchingSergio Ahumada2013-05-311-1/+1
| | | | | | | | | This amends commit 5e1f41cd070130d34090be506cc3e239d3159e8b Task-number: QTIFW-262 Change-Id: Iaa941bd6d30c5e5387505ca7674dda256afc66da Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Patch QT_HOST_LIBS qmake variableSergio Ahumada2013-05-271-0/+4
| | | | | | | | - add QT_HOST_LIBS (qt_hlibpath) to be patched Task-number: QTBUG-31339 Change-Id: I5b98bb4a44cf263e1f7db199610f31372b8899c3 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* describe why we shouldn't patch QT_INSTALL_CONFIGURATIONTim Jenssen2013-04-251-1/+4
| | | | | Change-Id: I30463b8aa612901c63f8087d6363df727cd35d7f Reviewed-by: Niels Weber <niels.weber@digia.com>
* enable Qt4 patch syntax in QtPatchOperationTim Jenssen2013-04-091-1/+2
| | | | | | Change-Id: I006db8975e077d0f7391b7d273606299cc2fd19e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Unify some error strings.Niels Weber2013-02-121-2/+2
| | | | | Change-Id: I3ce7d3f84c9654e5c457b9e5f6131ac931e8ba2f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix patching of QT_INSTALL_LIBEXECSkh12013-02-071-1/+1
| | | | | | | | | | qt_lbexpath=%1/lib should be qt_lbexpath=%1/libexec (cherry-picked from commit e16a779736d32b48bc0134112645da7815070e4b) Change-Id: I1dbd9506f4687f00ff2dba97146a34985bb1e650 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QT_INSTALL_LIBEXECS need to be patchedkh12013-02-071-0/+4
| | | | | | | | | | | - added the QT_INSTALL_LIBEXECS (qt_lbexpath) as one of the to be patched values on qmake and other binaries (cherry-picked from commit 0120690e3e9bb610e35c9568565f6a4530a48d2a) Change-Id: I747a1842c676244276fc88f4e9cef46b017141ad Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Patch QT_INSTALL_ARCHDATA and QT_INSTALL_QML in qmakekh12013-02-071-0/+8
| | | | | | | | | | | | | QT_INSTALL_ARCHDATA and QT_INSTALL_QML added into qmake. Patch these as well. (cherry-picked from commit afa15f21cd25e722da9349ff0eba72b8ab1fe9b1) Change-Id: Id2fbde58d70c7525e51be22a7370f1fbcbe6cf59 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Add 2013 to the copyright.Niels Weber2013-02-051-1/+1
| | | | | Change-Id: If64730ba7203d1a910a426c0d9c9a738ecfeff4b Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Change copyright headers from Nokia to DigiaSergio Ahumada2012-12-211-18/+27
| | | | | Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix QtPatchOperation for Qt 5Andreas Holzammer2012-12-171-1/+1
| | | | | | | Wrong index was fetched for the version argument Change-Id: I9de8e02ad7e7a2c748348b7043f3c8fcfdd1b297 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Some changes to start compile with Qt5.kh12012-11-201-2/+2
| | | | | Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* refactoring mac relocate operation used by qt patchkh12012-11-161-19/+18
| | | | | | | | | - improve the macreplaceinstallnamesoperation - remove unneeded macrelocateqt class and use the more generic macreplaceinstallnamesoperation Change-Id: I9d2c5bc5ea7ed56e09de8b327a9c8f9c02eb4f05 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix filter list handling in qtpatchoperation.cppIikka Eklund2012-09-281-4/+6
| | | | | | | | | | | | Fix a bug in filter handling. If no filters were given it caused all files to be included which was not the original intention. Added a check if no filters given then do not even try to search files by type. Change-Id: I2ceb83611c1c9a4a9f8bf58da0673c963dd4ae0c Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Incorporate following changes to support Qt5.kh12012-09-261-9/+15
| | | | | | | | d5e0dd38ead398d5be8126b4f21c0a50b7b61b17 72000567377d52d5d6e0db2b5d5b95407d85bbc1 Change-Id: I413f6f0ace095dc0d4b375cf392f8878e97ac27c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Added file mask feature into qtpatchoperationIikka Eklund2012-09-251-2/+33
| | | | | | | | | | | | | | | | | | | Added option to use file masks in files-to-patch-* to ease maintenance. E.g. to include all .prl files for patching you can add the following line into files-to-patch-* *.prl And the qtpatchoperation will then recursively search and patch all matching files under the base directory. Multiple file masks can be added on separate lines in files-to-patch-*, E.g. *.prl *.la *.pc Change-Id: I9c120b3ffb1f9f308f0c10f40b4a71ac46c84bc3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix broken build on MacIikka Eklund2012-06-271-0/+1
| | | | | | | | | | | | | On Mac the variable "scTargetDir" was not defined. This block of code was behind "#ifdef Q_OS_MAC" so other platforms were not affected. Added constants.h include for mac only to resolve the missing global constant. Change-Id: Ia8bef78d7c3015f283b202435d56d00187f3fb4f Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* remove unneeded #include "constants.h"Tim Jenssen2012-05-161-1/+0
| | | | | | Change-Id: Id25e26fd88a43f5470036e8d9cde04e5d7e7b0d8 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* use QHash where it is possibleTim Jenssen2012-05-031-21/+20
| | | | | Change-Id: I01edf5ee396ea61526dce52d7b7f4fd02721c220 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Fix patching of qmake for Qt5Andreas Holzammer2012-04-251-0/+16
| | | | | | | Change-Id: I0a039905c2b37105974270414478d6909325d2ad Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Reorganize the tree, have better ifw.pri. Shadow build support.kh12012-03-191-0/+343
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 02:02:23 +0000