summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* files-to-patch-windows-emb-arm missing from qtpatchoperationqt5Iikka Eklund2013-05-051-0/+2
| | | | | | | | | | files-to-patch-windows-emb-arm should be checked in qtpatchoperation as well. Otherwise it can not be found when reuqested. The files-to-patch-windows-emb-arm file itself already exists under resources. Change-Id: I2234ad144def593f5e6c48f50c16878e2eb0a843 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Add separate files-to-patch for embedded Windows packagesIikka Eklund2013-05-032-0/+8
| | | | | | | | | | E.g. this is needed for Android packages on Windows. Files that need to be patched differ from those that get patched for desktop targets. Change-Id: Iac58091729fe207c64aa17d4b946e170716677cf Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add missing files-to-patch-emb-arm into resource listIikka Eklund2013-04-182-67/+4
| | | | | | | | Also updated the content of the list. Change-Id: I4fc04b63868e1e41c15c80094c6e459b1686acf9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Rewrote file type registering.kh12013-03-062-108/+128
| | | | | | | | | | | | | | | Done now as described in MSDN. Make sure we honor the all users flag. Reset the file type only if there has nothing changed inbetween. Remove the ProgID entirely. Add the registered ProgId inside the common "Open with" menu as well. If passed a ProgId, use this one as key inside the classes hive. If not given, fallback to the more hacky *_auto_file naming scheme. Change-Id: I3f1c1a2301ad19b7fe215b65a8dd9c9419022f6c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Revert "Patch QT_INSTALL_CONFIGURATION in qmake executable"Iikka Eklund2013-01-251-5/+4
| | | | | | | | | | This reverts commit 594505538f875cf489f895e86f4d5c531f25ac9e. QT_INSTALL_CONFIGURATION should not be patched. Qt5 should be configured with -sysconfdir to get this right. Change-Id: Ib40bb3b2c25fca45ae6a92ac5fad2efd2dbdfc93 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Disable updater button until we have an online repository.Niels Weber2013-01-231-1/+1
| | | | | | | | Task: QTIFW-195 Change-Id: I3777e0a2dcdf27b1af92961861d62c59b9975dda Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Patch QT_INSTALL_CONFIGURATION in qmake executabletjenssen2013-01-111-4/+5
| | | | | | | | | For 5.0.1 the QT_INSTALL_CONFIGURATION needs to be patched (qt_stngpath). Task-number: QTIFW-200 Change-Id: I95ab9e9eb66f13227e589f68cde6408f0d45b5bd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add some more ambiguous chars and option to allow space.kh12013-01-115-5/+18
| | | | | | | | | | | | | | | Task-number: QTIFW-148 Task-number: QTIFW-161 Task-number: QTIFW-199 (cherry picked from commit 274c93b4a05967563f0b201ff0b6faf9b6292701) Conflicts: doc/installerfw.qdoc src/libs/installer/constants.h Change-Id: I65f9d0ae07fdd929a8c2fd71a94a441fe404b457 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* added first version of a product key checker APITim Jenssen2012-12-1411-3/+314
| | | | | Change-Id: Idea3826cdeb1ddda3469a647fee86e83b5881ecf Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* to be patched file list on Mac missed QtCore_debugtjenssen2012-12-141-0/+1
| | | | | | | Task-number: QTBUG-28496 Change-Id: I8ceeffce3b9c25c5ac87796ba80b4bfd7cb82aea Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Patch qdoc executableIikka Eklund2012-12-124-1/+4
| | | | | | | | qdoc executable needs to be patched by IFW Change-Id: Ie43883a6a4eca11e17c6ec27e56761af46a36c34 Task-number: QTBUG-28529 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* fix line endings in license files on windowstjenssen2012-12-111-1/+1
| | | | | | Change-Id: Ia2c06b02791c715405bacf6f801ca2ca71696d4b Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix patching of QT_INSTALL_LIBEXECSIikka Eklund2012-12-041-1/+1
| | | | | | | qt_lbexpath=%1/lib should be qt_lbexpath=%1/libexec Change-Id: I6a5397d96246257c1bdb28e1d9069269a6820fbb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QT_INSTALL_LIBEXECS need to be patchedtjenssen2012-12-031-0/+4
| | | | | | | | - added the QT_INSTALL_LIBEXECS (qt_lbexpath) as one of the to be patched values on qmake and other binaries Change-Id: I62f70bb6a9df7ab457f050af8e1adff38e0dc200 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Update files-to-patch-*Iikka Eklund2012-11-282-5/+5
| | | | | | | Library renaming caused changes in the file names Change-Id: Ie47f50ab46b6a1732078ce298ffe866cbca0f354 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add a hook to the calculateComponent methodIikka Eklund2012-11-282-0/+2
| | | | | | | - with we can add dynamic dependcies Change-Id: I63749447a762f13cad639b396b183264e9fad7bc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Patch QT_INSTALL_ARCHDATA and QT_INSTALL_QML in qmakeIikka Eklund2012-11-261-0/+8
| | | | | | | | | | | QT_INSTALL_ARCHDATA and QT_INSTALL_QML added into qmake. Patch these as well. Change-Id: I2467db71c62c8c44c054d0a23114542b6814ef02 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>
* Fix patching of QtMultimediaQuick_p.frameworkEike Ziller2012-11-121-1/+1
| | | | | | | Task-number: QTBUG-27898 Change-Id: I58b62473d8cb22bd4ea9627f45a8302158527d72 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Update uninstaller creation on Mac to work with separate installer dataPasi Matilainen2012-10-221-0/+43
| | | | | | | | | | | | Installer data is stored in a separate file on Mac, and writeUninstaller must be updated to understand that fact. To simplify code, the uninstaller magic marker is also stored in a separate data file. Also fixed writeUninstallerBinary to write the operations start and end values that are part of the data header. Change-Id: I3ee5d1eaa0542d6187a587fb72165c3a5b7306ec 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: Karsten Heimrich <karsten.heimrich@digia.com>
* installer: fix replacing executable name in MacTeemu Katajisto2012-09-261-1/+1
| | | | | | | | | | | | | Installer executable filename does not have suffix so use the whole file name as search string when updating the maintenance tool Info.plist file. Task-number: QTBUG-26900 Change-Id: I8fd7c981fa9490fc1882b78ec08da81c59dc7428 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Store installer data in a separate file on Mac to support code signingPasi Matilainen2012-09-232-0/+25
| | | | | | | | | | | | | Code signing fails on Mac OS X if there's any extra data after the link edit segment in a binary, so store the installer data in a separate file inside the bundle. Task-number: QTIFW-153 Change-Id: Ie1edf21212b4a3bc5b6f32eea3f5d61e8800a0d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Update license agreement page radio button texts for Qt 5.0.0 Beta 1Iikka Eklund2012-08-103-6/+6
| | | | | | | | | Update text from "Qt SDK" into "Qt 5.0.0 Beta 1" for license agreement page radio buttons. Change-Id: I92158660c6e5ce6f21913603d91092cca9c68172 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Disable unnecessary buttons from Qt5 beta maintenance toolIikka Eklund2012-08-071-6/+6
| | | | | | | | | | | Fully disabling updater and package manager from maintenance tool. With this change the above mentioned radio buttons will get greyed out thus the user can not try to connect into remote repository. Change-Id: Ieef38c18f7b6d6ba236575c1d3966454e564f09f Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update files-to-patch-* for qt5Iikka Eklund2012-08-033-604/+19
| | | | | | | | | | | Updated the files lists for missing items. Use file masks to ease maintenance. This depends on change: I9c120b3ffb1f9f308f0c10f40b4a71ac46c84bc3 Change-Id: I70a6c54ebc6c69db012829ddc88b6819095068ae Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Added file mask feature into qtpatchoperationIikka Eklund2012-08-032-2/+36
| | | | | | | | | | | | | | | | | | 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>
* Quick fix for the broken back button in layoutIikka Eklund2012-07-311-1/+1
| | | | | | | | | | Made Windows to use ModernStyle as default style with QWizard. Quick fix for the broken layout (misplaced back button) of Aero theme. Change-Id: I337ac5c86d44ef9ecd5e60aa8ef89e2bd19120ef Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix Mac Qt framework id changingTeemu Katajisto2012-07-241-1/+1
| | | | | | | | | Fix the case where Qt framework was not udpated with install_name_tool if the framework name contained other numbers than 3 (e.g. QtV8 and QtQuick1). Change-Id: I189c5d650982263ff27a3e18a2e0bd98983c5ce2 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix broken build on MacIikka Eklund2012-06-281-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: Tim Jenssen <tim.jenssen@nokia.com>
* Add qmodule.pri to be patchedIikka Eklund2012-06-282-0/+2
| | | | | | | For Qt5 add qmodule.pri file to be patched as well. Change-Id: Iaaef6d2a4842046489f40398faf6c13d386d2f97 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Merge remote-tracking branch 'origin/master' into qt5Lars Knoll2012-06-1346-367/+951
|\ | | | | | | Change-Id: I5ee4f3e628f929642b71afaf4d70a00d057834a3
| * Fix create archive with files only. See code comment.kh12012-06-131-4/+6
| | | | | | | | | | Change-Id: Iba14d0a895cebd2a212221309dfbcd521db3e75e Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * fix openpty static link problemTim Jenssen2012-06-125-4/+2
| | | | | | | | | | | | | | | | | | - as the linker only adds symbols which are needed, the order of the libraries are important Change-Id: Iad8e5a5015cc5949be9b8f0b01702a7f854f6d95 Reviewed-by: Rainer Keller <rainer.keller@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * add the installer create datetime to --versionTim Jenssen2012-06-122-1/+19
| | | | | | | | | | | | | | | | | | | | - binarycreate patches the installerbase to add the installer create datetime - output is now: Installer creation time 2012-06-08 - 17:39:43 IFW Version: "1.0.0", Installer base SHA1: "7031ecf", Build date: "Jun 8 2012". Change-Id: I8f82c6942eefaf49e5ad8605577a0034a7502a6c Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
| * remove -qt-gif option from README as wellNiels Weber2012-06-111-1/+1
| | | | | | | | | | Change-Id: Ib3fc1592f9be94f9452462e499ed15a1e4eeec67 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
| * clean up exception usageTim Jenssen2012-06-113-59/+27
| | | | | | | | | | Change-Id: I6e1fd425e9b528049f1d461eb2d66c49f70e7288 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
| * adjust the existing create-test-installer.bat to new syntax of the ifwTim Jenssen2012-06-111-41/+58
| | | | | | | | | | | | | | Change-Id: Idedcdb57ef169114ef2974a4a748a86ad88b9739 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * Bring documentation of Repositories tag in line with the code.Niels Weber2012-06-081-13/+12
| | | | | | | | | | | | | | | | Remove obsolete option, add missing options. Change-Id: I4d34c7dcbb222243b35bb5362db9222c96e30dcc Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * Include unistd.h where needed on LinuxNiels Weber2012-06-053-0/+8
| | | | | | | | | | | | | | | | | | | | This allows compiling with gcc 4.7. For more information see: http://gcc.gnu.org/gcc-4.7/porting_to.html Change-Id: I1b3b62fad3c44bdeb701d961297519a2057bf76e Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * add working dir parameterMaurice Kalinowski2012-06-042-4/+11
| | | | | | | | | | | | | | | | sometimes it is useful to launch a process with a specified working directory. Only use this as an optional argument. Change-Id: I4eedd9b27713b9bc284f1945e67e115b5615640b Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * Revert "windows needs to know that the link will be a directory"Tim Jenssen2012-06-011-7/+4
| | | | | | | | | | | | | | | | | | - better is to use it on existing directory This reverts commit a240e7dbadc3f0cbcd4a483ddf7093562df8ca37. Change-Id: I9103174eaa392a28b7a278ca9343a94b66d76e80 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
| * QFileInfo.exists looks for the target which wasn't intendedTim Jenssen2012-05-312-3/+3
| | | | | | | | | | Change-Id: I8d371045bb500f8954a42523f8d5024b04309ceb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * windows needs to know that the link will be a directoryTim Jenssen2012-05-311-4/+7
| | | | | | | | | | | | | | | | - but at the moment the directory doesn't exist so the only thing is to get that information from the last char Change-Id: I96ecc086ca19047dc0a3ae57262e903ae8923535 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
| * fix case in READMENiels Weber2012-05-311-1/+1
| | | | | | | | | | Change-Id: Ib156fc53e87f87b410695e9ca91efa2380e57134 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
| * QFileInfo(m_path).readLink(); can't read junctionsTim Jenssen2012-05-303-18/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | - in older code there was a try to resolve junctions like symbolic links, but this broke many other code - we copied the read windows symlink code from the private qt file and made small adjustmenst to be able to call it directly in targetPath() method - and changed the isValid behaviour, because we want to create links to locations which are created later - and it is creating the path to the link on every OS Change-Id: Id11839bbf2ecfde410982833d10f96d36fe1cab7 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
| * normalize the pathes in windows create link functionsTim Jenssen2012-05-301-2/+5
| | | | | | | | | | | | Change-Id: I83dd005fa3ee3732cb1884deb87c1bfebbbe3237 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
| * execute the dependsOnLocalInstallerBinary check after beginInstallationTim Jenssen2012-05-301-15/+24
| | | | | | | | | | | | | | | | | | | | | | - beginInstallation needs to be run before checking for dependsOnLocalInstallerBinary as that value isn't set before - with this change we can use the beginnInstallation method in the component scripts to set this depends check Change-Id: Ib0964ab84a43499b3dc574aa5d7aecb2c69f01f1 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
| * now setValue methods are replacing @variables@Tim Jenssen2012-05-252-7/+10
| | | | | | | | | | | | | | Change-Id: I9ded8cc4c226b4f3694e1f7fe7ad012269c18dde Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
| * add a fallback for alreadys installed installationsTim Jenssen2012-05-259-28/+109
| | | | | | | | | | | | Change-Id: Ib7dd955cb89e307d557b7a4706a885c031d6289f Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
| * added new Link class and corresponding operationTim Jenssen2012-05-257-90/+466
| | | | | | | | | | | | | | - replace read junction link target code with already existing Qt code Change-Id: I6642f19ceb9a907791987ced8e9eacc6ca4f2780 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 01:17:09 +0000