summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* windeployqt: Add json option for external parsingwip/winrtAndrew Knight2013-08-221-4/+59
| | | | | | | Add option to print parsable output (json) for use in external tools. Change-Id: I9bd768f6e9fe415f5f7056a34431f4cdb0363197 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Always use verbosity level for user messagesAndrew Knight2013-08-203-21/+26
| | | | | | | | Send all progress messages to stdout, and errors/warnings to stderr. Guard all stdout messages with verbosity level. Change-Id: I2eea11f2f8920ccffaac97ba7fc9abd0ab18cdfa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Add option -libdir for a library target path.Friedemann Kleint2013-07-123-2/+37
| | | | | Change-Id: Ic135caf1857c6372313f35abb7d4b61152b9cc8c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Deploy UNIX/Linux.Friedemann Kleint2013-07-113-78/+201
| | | | | | | | | | | | Extend platform enumeration by UNIX, determine platform by running qmake first. Pass platform to relevant functions (finding binaries, building DLL names, etc). Use 'ldd' to obtain dependencies of binaries and 'file' to determine the binary type. Do ICU/ANGLE handling for Windows only. Change-Id: I1245c90c0b80fa4039241b556a768a5b28b46771 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Handle simple symbolic links in updateFile().Friedemann Kleint2013-06-252-5/+53
| | | | | | | | Preparing the deployment of shared libraries and their version links on Unix. Change-Id: Iee9e25e5364209c0a4aafbd6d10c18e64113c971 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Fix location of web process.Friedemann Kleint2013-06-251-1/+1
| | | | | Change-Id: I3b926f189a48aa391e3c3e4aa1edea518d5cf13e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Compile on UNIX.Friedemann Kleint2013-06-254-42/+228
| | | | | | | | | Rearrange code within OS-ifdefs. Change runProcess to take a binary and a list of arguments since that fits better with execvp. Change-Id: Ib6733c615e6dfc6b483e457ff90a59a1c0dcaded Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Report directory with correct slashes.Friedemann Kleint2013-06-171-1/+1
| | | | | Change-Id: I88c5e6af3dc37a69701be0ffc2913fb6834e31bf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Add deployment of the WebKit2.Friedemann Kleint2013-06-171-1/+48
| | | | | | | Add option -webkit2 for forcing it. Change-Id: I3d75f00dc36beb60b0f54982b0d03415d4916826 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Fix ANGLE deployment.Friedemann Kleint2013-06-101-3/+3
| | | | | Change-Id: I063b24c500f7cf947013247aa393b879e297f2ba Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Fix build with MinGW.Friedemann Kleint2013-06-101-2/+3
| | | | | Change-Id: I7fb23ef9c755c7617889635b13b8abc1741f52a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Fix webkit 1.Friedemann Kleint2013-06-101-43/+76
| | | | | | | | | | | | | | | | | Split findDependentQtLibraries() such that it returns the direct dependencies first and their number. Prevent WebKit1 applications from installing the QML import tree (triggered by WebKit.dll depending on Quick) checking for direct dependencies to Quick only. Print dependencies. Introduce struct DeployResult, which returns the direct/used/deployed dependencies, preparing WebKit2-deployment. Change-Id: I171ca553ee352df2a6f8b0b3d6c0ca72e5c7adab Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* windeployqt: Make it possible to pass executables as well.Friedemann Kleint2013-06-101-28/+41
| | | | | | | | Remove global optDirectory, pass binary and directory in options struct. Change-Id: I51a8d2454a8d2bd9961d9458559e58af66de72ad Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* windeployqt: Add more modules to enumeration, add options control.Friedemann Kleint2013-06-102-94/+201
| | | | | | | | | Move enumeration from tools into main.cpp, introduce data struct to contain name, options and translation. Add options to enable/ disable modules. Change-Id: I80022ef1d8fae7fd42d5e373ef5c4db08d1568ee Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* windeployqt: Add translations.Friedemann Kleint2013-06-072-4/+83
| | | | | | | | | | | | Use lconvert to concatenate all required files into one qt_XX.qm which is then loaded. This way, the application loads the catalog file qt_XX.qm when running against installed Qt and the concatenated file containing only the required translations when deployed. Change-Id: I3a5cf76705a23eee983ff5356107d40e399d6cc1 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Introduce Options struct and deploy function.Friedemann Kleint2013-06-061-75/+78
| | | | | | | Preparing for the deployment of the QtWebProcess. Change-Id: I1ed5a5803d37e58ee56cf9879182d10ef7013fd9 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* windeployqt: Fix runProcess().Friedemann Kleint2013-06-041-8/+5
| | | | | | | Use workingDirectory parameter and allow for long command lines. Change-Id: I883eb569c82b0615d159f04dcf9991378164b777 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Add png-files to filter list for QML import.Friedemann Kleint2013-05-291-1/+1
| | | | | Change-Id: Ieee83ea3394f5b5a7fe03092576a593c6650a40f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Exactly match debug/release DLLs based on PE information.Friedemann Kleint2013-05-273-74/+214
| | | | | | | | | | | Change updateFile() to be a template to be able to match files with a predicate function and implement it for discriminating debug/release DLLs. Reshuffle code, move findQtPlugins() to main.cpp. Change-Id: I75fe90ed2329a482d294abf6faeac700e1234167 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Read more information from PE executables.Friedemann Kleint2013-05-272-7/+47
| | | | | | | | | Read out debug information in order to be able to sort debug/release plugins more cleanly. Change-Id: Ia792064dca0a3beb3d671cf9a6175af8a5bf939f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* windeployqt: Copy Quick 1, 2 imports.Friedemann Kleint2013-05-163-37/+83
| | | | | | | | Change the plugintype enumeration to be a module enumeration which works better. Deploy imports with some smartness. Change-Id: I4777816a24f4e13fb5416e9467357464e4e7ac21 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Add namefilter to updateFile.Friedemann Kleint2013-05-162-7/+10
| | | | | Change-Id: I5dbebef725195ca7c43bc653f5defa52d3b45714 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Query qmake once and store in map.Friedemann Kleint2013-05-163-4/+38
| | | | | Change-Id: I4bb93404e4ceb97ce5b1a8c9979e06460bdeabda Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* windeployqt: Fix runProcess.Friedemann Kleint2013-05-161-5/+19
| | | | | | | | Provide a buffer for the command line which CreateProcess sometimes modifies, inherit handles. Change-Id: I5a20655e87b2f86dae4f7ac507cb631a30bb187c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Handle directories in updateFile().Friedemann Kleint2013-05-161-1/+34
| | | | | Change-Id: Ifd044e642ae8c3fdc614e939e5dca9b55c91db52 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Rename winrtdeployqt to windeployqt.Friedemann Kleint2013-05-155-4/+4
| | | | | | Change-Id: I71a0a15860326d3d54c73940505e1c738f00b5f1 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* add winphone to the valid list for winrt platform pluginsMaurice Kalinowski2013-05-081-1/+5
| | | | | | | Windows phone uses the same platform plugin as Windows RT. Change-Id: I35ae84a5887899335a9b3e9342db325b34dd6cff Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* winrtdeployqt: Recursively scan Qt libraries and copy only required plugins.Friedemann Kleint2013-05-063-28/+103
| | | | | | Change-Id: I09c456a0cbc5ea98fe56648965b129616d22aec0 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* winrtdeployqt: Check further dependenciesFriedemann Kleint2013-04-294-20/+119
| | | | | | | | - Check on the platform plugin for ANGLE - Check on Qt5Core for ICU. Change-Id: I4eae36eaa4f9425f28a31684cd470c5a20fcb526 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* winrtdeployqt: Read PE-files to find dependent libraries.Friedemann Kleint2013-04-263-62/+147
| | | | | | | | Remove invocation of depends.exe, which might not be installed/in the path. Change-Id: Ib896e5a21d41c7b419d6932bb839d506480cce02 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* winrtdeployqt: Remove existing target files.Friedemann Kleint2013-04-161-5/+13
| | | | | | Change-Id: Ib50ae4805b570b5cbf1f849ae48ab46c0380ffc6 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Say hello to winrtdeployqt.Friedemann Kleint2013-04-125-0/+590
| | | | | | | Add tool winrtdepploy to copy/update Qt libraries and plugins. Change-Id: Ida204de92df0bc06464259df679cd70db4ffcea5 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* lupdate: allow to configure names of tr()-like functionsMarc Mutz2013-04-098-64/+540
| | | | | | | | | | | | This makes it possible to use lupdate in projects that would like to wrap the tr()-like functions with their own versions, e.g. to add error checking or other instrumentation code. While we're at it, also simplify the c++ parsing with partly table-driven code. Change-Id: I72af68afa851a46342e75dcdd3dd58f4c14276b8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-033-10/+9
|\ | | | | | | Change-Id: I5e1eb924132b9f1a032886d3b6c0e16bcc623fa9
| * Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.Stephen Kelly2013-03-273-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generation relied on the uitools module for the version, so if it was not available, we got errors like this: WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake' WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake' WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake' http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the generation location. Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | | | | | | Change-Id: I310777c1005de28da1eb6326fec03ebb7716919a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-275-46/+50
|\ \ | |/ | | | | Change-Id: Iaa0684017736c6a5ec387a201add89fc351adfe2
| * Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I1f48216fd27e40d70ffd020ed1b880b03df0bf12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Doc: edit Qt Linguist Manual for styleLeena Miettinen2013-03-251-17/+21
| | | | | | | | | | | | | | | | Replaced "e.g." with "for example" and "etc" with "and so on". Removed contractions. Removed some extra spaces. Change-Id: Ic0b9d5df2ee7f7bb080abb002027546f0fc6da4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Doc: move Qt Linguist overview informationLeena Miettinen2013-03-231-14/+23
| | | | | | | | | | | | | | From front page to a separate topic. Change-Id: Idc9a599e0c8f095b0d6d63fd74b43848a8b13d3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Merge branch 'dev' into stableSergio Ahumada2013-03-20133-1997/+185
| |\ | |/ |/| | | | | | | This starts Qt 5.1 release cycle Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
* | make lupdate a host toolOswald Buddenhagen2013-03-192-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lupdate makes no sense on x-built targets at all. though one may also argue whether it makes sense to actually bootstrap it - while its use may be supported by the build system, it's typically not part of regular builds, but rather used shortly before running linguist - for which a host build of qt is necessary anyway. one argument for bootstrapping is that it uses the qmldevtools library, which logically should be bootstrapped (the only other current user is qmlmin, which definitely *is* used in regular builds and thus needs bootstrapping). Change-Id: Ia3ddd901fe2b0c2b7b77af7f1ebc66d757fc7783 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | make lconvert a host toolOswald Buddenhagen2013-03-192-0/+3
| | | | | | | | | | | | | | | | it's a build tool, so it should be built for the host. Change-Id: I55baee65d3e91bf5189c10f30e23975abfc4de10 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | make lrelease only optionally bootstrappedOswald Buddenhagen2013-03-192-2/+2
| | | | | | | | | | | | | | qt_tool.prf handles the magic for us. Change-Id: Ifb8e7fd7ff0e46b9b274c9d156e048e89586ab2c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | fix translation contextsOswald Buddenhagen2013-03-198-28/+10
| | | | | | | | | | | | | | | | the bootstrapped library now fakes the translation api sufficiently well to enable unifying the usage. Change-Id: I6a5d7cb1bb67830f1ea0a732566ebee354d62e7e Reviewed-by: hjk <hjk121@nokiamail.com>
* | support only utf-8 and utf-16 for source codeOswald Buddenhagen2013-03-195-27/+24
| | | | | | | | | | | | | | | | | | utf-16 is optionally used by java and msvc. it doesn't hurt to support it. all other encodings are not used anyway (other than 8-bit pass-through, but this is a matter for (the also removed) CodecForTr). Change-Id: Ie6482e187a9a8276918b53e97faeac88a40eb52c Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-147-6/+11
|\ \ | | | | | | | | | Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
* | | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-133-603/+0
| | | | | | | | | | | | | | | Change-Id: I629046a2a7aa0611cda4f04f8d6253d5db4e05a3 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | purge CODECFORTR & -codecfortr supportOswald Buddenhagen2013-03-1254-882/+69
| | | | | | | | | | | | | | | | | | | | | | | | qt-based code is expected to be utf8-encoded nowadays. the respective c++ interfaces have been purged in 5.0 already. Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | purge ui3 support from lupdateOswald Buddenhagen2013-03-123-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | there is no qt3support in qt 5 any more. Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
View Lorry Controller Status