summaryrefslogtreecommitdiffstats
path: root/src/sdk/sdk.pro
Commit message (Collapse)AuthorAgeFilesLines
* move ts targets to a separate project fileOswald Buddenhagen2018-02-281-32/+0
| | | | | | | | that makes it possible to update the templates even if the ifw itself cannot be built (e.g., due to using a -no-widgets qt build). Change-Id: Ie170e6524dbed40f6c8b837e35af6b45a1c2d2dd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Enable building IFW with Squish supportKatja Marttila2018-02-121-0/+5
| | | | | | | | | | | | Change enables building IFW with Squish support by passing SQUISH_PATH to qmake when building IFW. Also enables runtime change of Squish port with command line option --squish-port <port number>. If no port is set, default port 11233 is used to attach to Squish. Change-Id: I4821b360031df66968d3592886c2e45598e1b097 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
* make .ts file naming follow the usual patternOswald Buddenhagen2018-01-031-16/+16
| | | | | | | | this makes it easier to integrate ifw into the surrounding infrastructure. Change-Id: I7918830b7a6c29d8556911eec83a3b6530478d84 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* add target to create untranslated.tsOswald Buddenhagen2017-05-151-2/+3
| | | | | | | this is the standard way to start a new translation. Change-Id: Ie0235e41e39484af0b832a9b7488501bc883aaea Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* auto-generate english "translation"Oswald Buddenhagen2017-05-151-0/+6
| | | | | | | | this file is merely a placeholder. there is no point in it being in the repository. Change-Id: Id07be46a9fa0c2eb14cbc567cb95e67c00f18b02 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* revamp build of translationsOswald Buddenhagen2017-05-151-40/+31
| | | | | | | | | | | | | instead of using a hand-crafted qrc file, auto-generate one. this allows us to collect available translations dynamically, which means that we don't need to limit ourselves to the state of qt 5.5. as a side effect, this removes the possibility to compile the qt translations ourselves. i'm not sure what the point of that was, as every qt installation would have pre-compiled qm files. Change-Id: Ie88327e848c2498eb2a63a895a80e1cd603619b8 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* fix commit-ts targetOswald Buddenhagen2017-05-151-6/+6
| | | | | | | | | the pattern *_?? (meant to exclude *_untranslated) doesn't match ifw's translations without a country code, because they have only a language code. use two patterns instead. Change-Id: I5c0f67c339053281dfbee1bcd16b03ac6ca1b6e2 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Avoid warning messages when passing '--platform minimal'Frerich Raabe2017-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unattended installations typically use no UI, and the documentation recommends passing '-platform minimal' (note: one dash!) to hide the UI. Alas, the command line parsing is not implemented in terms of QCoreApplication::arguments() which means that even the -platform argument which is meant to be processed by QApplication is interpreted by the command line parser -- which then complains about the unknown switch by printing Unknown option: p, l, a, t, f, o, r, m Let's avoid this by just registering a dummy '--platform' switch ourselves. It has no effect, but avoids the warning. This however means that two dashes need to be used, because that's how the command line parser works. For what it's worth, there is also a 'gui.setSilent()' setter, but it's not quite as comprehensive as using the 'minimal' platform plugin: using setSilent() will still create a QApplication and thus create e.g. a task bar entry on OS X (and I suspect it requires an X connection on Linux). The 'minimal' platform plugin apparently avoids this. Change-Id: I8cd4cfd496f8c435f0766e3162672eaefbef94cc Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Merge remote-tracking branch 'origin/2.0'Katja Marttila2016-06-211-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/7zip/7zip.pro src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp src/libs/installer/component.cpp src/libs/installer/lib7z_facade.cpp src/libs/installer/packagemanagercore.cpp src/libs/installer/proxycredentialsdialog.h src/sdk/translations/ja.ts tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp tests/auto/installer/scriptengine/tst_scriptengine.cpp tests/auto/installer/settings/tst_settings.cpp Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2
| * add make install functionality with INSTALL_ROOTKatja Marttila2016-05-191-0/+3
| | | | | | | | | | | | Change-Id: I8bad1c9bbe7b705ff0842f15fb0c9bc6c127e9bc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | Fix spanish language import nameKatja Marttila2015-11-271-1/+1
| | | | | | | | | | | | | | | | | | Spanish language was imported as name qtbase_es.qm. As it is not found under Qt translations, all other translations were skipped to. Change-Id: I093e72abf7385ca7926d61a14225e3254c1c1fbd Task-number: QTIFW-791 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Add Castilian Spanish translationJavier Llorente2015-09-241-2/+2
|/ | | | | | Change-Id: I6cef758f1b9746b4eb03670765677bb8f5b275c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix embedding of installbase manifestKai Koehne2015-03-111-3/+3
| | | | | | | | | | | | Redefining QMAKE_MANIFEST is currently broken in Qt for newer compilers: The content is not embedded at all if the toolchain supports "embedding". But the hack is not needed anyway: Just disable the Qt manifest magic, and include our custom manifest file via .rc. This way we can also avoid changing the mkspec for embed_manifest_exe, embed_manifest_dll. Change-Id: I5155ddabe17f0b61b2d7b9c5b9cd912ad6c53dfe Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Added Italian translationcuoghimax2015-02-271-2/+2
| | | | | Change-Id: I7c5dbe0a5610dc9b7671d6db3f57c169096c7ef2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix dependencies in static buildKai Koehne2015-02-251-0/+7
| | | | | Change-Id: Iae06c6d5a9b1c678a4ab136da145a9c69ccadb6e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Add Polish translationsjkobus2015-01-301-2/+2
| | | | | | Change-Id: I311c5f0139e3fc54909b35d0629fecce58bcd37c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix that the message of Qt module is not translated.Takayuki ORITO2015-01-131-1/+1
| | | | | | | Translation files(qt_*.ts/qm) of Qt module has been split.(some of the language) Change-Id: I41727bbec40d46c843cc70ab831dc41c650a2e1b Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* sdk.pro was missing the ts file changeNiels Weber2015-01-061-1/+1
| | | | | Change-Id: I30f36958759c920cabe38452176a856deeeefad2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/1.6'Kai Koehne2014-11-181-2/+2
|\ | | | | | | | | | | | | | | | | Conflicts: src/libs/installer/packagemanagercore.cpp src/sdk/installerbase.cpp tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp Change-Id: I807686f154249930d31de80289389f4655c27525
| * French translationMatthieu Bachelier2014-08-271-2/+2
| | | | | | | | | | | | Change-Id: Ifc5c2cc74dad576733b870cb135b45457de434ce Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Split and implement new installer base, update checker.kh12014-09-041-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Based on the former patches, split the installer base into its own class. Use the new binary content read functions. Adjust uses to match the new classes. Adjust installer base /update checker signature and inheritance. Remove all now superfluous functions from binary content. Core engine instantiates the operations now, makes reading and writing more generic. Move product key check into QInstaller namespace. Make use of the new command line parser. Change-Id: I00aff79085b69ce627906881b43f374681ea7e91 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Move Console implementation (Windows) in .cpp fileKai Koehne2014-07-181-0/+2
| | | | | | | | | | | | | | No logic has been altered. Change-Id: I1784cc50a454258435ae11d4d67d6951b5039e9f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Move updater class into sdk binary and rename to UpdateChecker.kh12014-07-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove some now superfluous methods from binary format. Adjust initializing some objects as we need them not earlier. Unify implementation of accessing the right binary to read the content from. UpdateChecker does now have its own run checker, makes it possible to run the binary even if a e.g. maintenace tool is already running. Change-Id: I94f32f7f38b62b5aee433753abc2fe72e879ddc9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Use QCommandlineParser, remove some developer related options.kh12014-07-101-2/+1
| | | | | | | | | | | | | | | | | | Remove: --runoperation, --undooperation, --update-installerbase --dump-binary-data, Script, Updater, ManagePackages Some of these options will go into a separate dev related tool. Change-Id: I31084f60d3ed9a33abeb3df90fadf939d3b4c0a7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove Qt 4 scopes in .pro filesKai Koehne2014-07-021-9/+2
| | | | | | | | | | Change-Id: I8e0793700196ea49e06a5c46731afd258f6443c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Replace script with js engine.kh12014-06-031-1/+1
| | | | | | | | | | Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Cleanup to support Qt5 only.kh12014-06-021-9/+5
|/ | | | | Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
* Merge remote-tracking branch 'origin/1.5'Oswald Buddenhagen2014-03-271-0/+31
|\ | | | | | | | | | | | | Conflicts: installerfw.pri Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
| * Add ts-<lang>, ts-all, commit-ts rules for translationsTakumi Asaki2014-02-101-0/+31
| | | | | | | | | | | | | | | | Add ts-<lang>, ts-all, commit-ts rules to src/sdk/sdk.pro for translator's convenience. Change-Id: Ie75641870e78b78f4db04ec9c7e4460b86d079c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | add headless possibilityTim Jenssen2014-02-181-0/+6
|/ | | | | | Change-Id: I05eb763f0b8d8c97ceccc7bb2db2086c04ffa92b Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix: Path handling in project filesTakumi Asaki2014-02-031-2/+2
| | | | | | | | | | | Because of cleanPath() converts native separators to '/', call toNativeSeparators() after cleanPath(). Due to warning message from "if (exists(filePath))" on Windows, if() around the exists() are removed. Change-Id: I412fe83f13365c8eec00e119270d07ce7f72297d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix --checkupdates shows error dialog if network is down.kh12014-01-081-1/+3
| | | | | | | | | | | | Task-number: QTIFW-431 We need to add a separate console window in case we run on windows, though we can't use a gui application as the lib might popup message boxes. (MessageBoxHandler checks against a running core application) Change-Id: Idad8dff44c6c0bfb0bb45e8a0fb408b3db832c3c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Add Japanese translation.Takumi Asaki2013-08-221-2/+2
| | | | | | Change-Id: I1537facf4054a27359878d114b8c9278a2bdfe19 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-06-131-2/+2
|\ | | | | | | Change-Id: Ic8e6c13d020dbff3e1fb1ef156742aef81ba1b25
| * Adding the translation for zh_cn.Alessandro Portale2013-06-121-2/+2
| | | | | | | | | | | | | | Change-Id: I2d8b8f9b4ce5a1818955ee6c9ccd53a16f594187 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | introduce no_app_bundle.priTim Jenssen2013-05-271-0/+2
|/ | | | | | | - it tries to copy the needed qt_menu.nib dir Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Clean up Qt 5 build rulesKai Koehne2013-03-061-1/+6
| | | | | | | Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add ru translation.Ivan Komissarov2013-02-051-2/+2
| | | | | | Change-Id: Ic4e3f1c4099c4ff187eb4c81b66baf44da7b9e51 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Make IFW compile with mingw.kh12013-01-291-2/+4
| | | | | Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust to compile with Qt5.kh12012-11-221-2/+7
| | | | | Change-Id: I82672d7da43ce51703a02d2174617ce121c6fafa Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Force to write our own manifest file into the binary.kh12012-11-211-9/+4
| | | | | Change-Id: I44cc8012f2ffa1a177582d674759b11785c88258 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Follow advice given by Joerg, DEPENDPATH is now deprecated.kh12012-11-201-1/+0
| | | | | Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* remove app_bundle config only if it is a static build on MacTim Jenssen2012-11-091-2/+0
| | | | | Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Revert "Fixes required for errorless MinGW-w64 compilation are done."kh12012-08-221-1/+1
| | | | | | | | This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it breaks compressing the meta folder (Windows 7, VS 2010). Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fixes required for errorless MinGW-w64 compilation are done.tjenssen2012-08-101-1/+1
| | | | | | Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* fix openpty static link problemTim Jenssen2012-06-121-1/+0
| | | | | | | | | - 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>
* Fix broken check for translation files.kh12012-05-071-1/+1
| | | | | | | | Even if SUCCESS contains false, the term evaluates to true cause SUCCESS is not empty... Change-Id: I259e6224de9816629c4fb538a49dd072ea58e7d3 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Build and compile the resource on the fly.kh12012-03-221-12/+56
| | | | | | | | | Copy over the qt qm files. Run lupdate on our ts files. Run rcc and generate the qrc_*.cpp file used to compile. Change-Id: Ib726dde084643848d5edab700476b133326c54d7 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Reorganize the tree, have better ifw.pri. Shadow build support.kh12012-03-191-0/+51
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 20:10:50 +0000