summaryrefslogtreecommitdiffstats
path: root/installerfw.pri
Commit message (Collapse)AuthorAgeFilesLines
...
* Allow to check for IFW version in codeKai Koehne2014-11-111-2/+4
| | | | | | | | | | Rename the IFW_VERSION to IFW_VERSION_STR, and add a new IFW_VERSION define that encodes the version in hex. This follows the pattern of QT_VERSION and QT_VERSION_STR, and allows easy checking of the IFW version e.g. in macros. Change-Id: I232c8aa53c9a04522810208cdd1ac595d8676879 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Implement progress indicator on taskbar on Windows.kh12014-09-111-0/+1
| | | | | | | Task-number: QTIFW-15 Change-Id: Ia11c185f25dff2f1614425ec5ff78e79b2fa2a77 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Enable QStringBuilderKai Koehne2014-06-191-1/+1
| | | | | | | QStringBuilder improves the speed of string concatenation a lot ... Change-Id: I9dedf7c3335ebf4a9194e837f9eb8135fae11356 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Enable C++11 mode in compilersKai Koehne2014-06-191-1/+1
| | | | | | | | Qt 5 uses C++11 features mostly for speeding up things. Change-Id: Idcb3a95cd24b44c5147ff2e14f468f069da5e0c3 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove superfluous Qt4 code.kh12014-06-041-13/+1
| | | | | Change-Id: I0bd609dec191fdf65fb2370cd68291e87ae62750 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix qmake warning about "Redundant entries in QTPLUGIN"Kai Koehne2014-06-041-1/+0
| | | | | | | | | | | | | Fix qmake warning Redundant entries in QTPLUGIN: qico qtaccessiblewidgets In qtbase commit 4255ba40ab073af (Qt 5.3.0 and newer) the plugins are added automatically, based on the Qt module one links against. Change-Id: I45200db2f3bf9b6194f92bf864ab58ceb5c71f16 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Master needs at least Qt 5.3.0.kh12014-06-031-0/+23
| | | | | | Change-Id: I3bdd1c80d6709b0ef92f8d2bc8cab16fe7ed62b6 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@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-16/+5
| | | | | Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
* Update version numberKai Koehne2014-04-041-1/+1
| | | | | Change-Id: Id67d098d554030aa3c8425ad306eed72a187f771 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Merge remote-tracking branch 'origin/1.5'Oswald Buddenhagen2014-03-271-4/+8
|\ | | | | | | | | | | | | Conflicts: installerfw.pri Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
| * Add ts-<lang>, ts-all, commit-ts rules for translationsTakumi Asaki2014-02-101-3/+9
| | | | | | | | | | | | | | | | 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 lconvert to pri file.Niels Weber2014-03-191-0/+2
| | | | | | | | | | Change-Id: I09da477700da81a4fd678b959553e2078b8c1bc0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Bump versionNiels Weber2014-03-061-1/+1
| | | | | | | | | | Change-Id: Ie693487fd2d2c6fd5c60955b2face7eb2e58ac94 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Silence private header warning.Niels Weber2014-02-171-0/+1
|/ | | | | | | | IFW has to be build statically anyway to be of use, so this warning isn't needed. Change-Id: I1062a299acc1bf1af83d93f597fe9db15da2bed5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Compile fix after native separator change.kh12014-02-041-0/+3
| | | | | Change-Id: I3044637a65b87483dd9ded63920adb5536952700 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix: Path handling in project filesTakumi Asaki2014-02-031-3/+3
| | | | | | | | | | | 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>
* Bump version numberNiels Weber2014-01-291-2/+1
| | | | | Change-Id: I22bda59c70f54336d82dc9bbbedf9330b47478c8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* increase version to 1.5Tim Jenssen2013-10-251-1/+1
| | | | | Change-Id: Ia128e8b214835052507d79348714efc947f72f15 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Build installers with accessibility pluginTim Jenssen2013-10-251-2/+2
| | | | | | | | | This change makes the installers work with screen readers. Task-number: QTBUG-34296 Change-Id: I87cf313657d9eaa31f4cd89729b4e298880ae99e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-10-231-2/+8
|\ | | | | | | Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
| * Fix possible crash. Disable close button during installer run.Tim Jenssen2013-09-301-0/+3
| | | | | | | | | | Change-Id: I6a0affab7394e3ae9669904bbfc48617b5cb1bd5 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Check for mingw-gcc vs mingw-msvc when checking dependencesMichal Klocek2013-09-181-1/+2
| | | | | | | | | | | | | | Fixes wrong library naiming when running with mingw-gcc Change-Id: Id8bf210f1a119e296a212a9d0570a4c918e780c5 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Fix incremental buildsMichal Klocek2013-09-171-2/+4
| | | | | | | | | | | | | | | | | | The missing dependency to installer library causes corrupted incremental builds, installerbase should be rebuild when installer lib is changed. Change-Id: I588577f3d178c70dff2d84747f221d924e5cf38e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * Bump versionKai Koehne2013-08-291-1/+1
| | | | | | | | | | | | Change-Id: Ie18e88bb65a8765afdd3e1e8767ad0cb9b584d77 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.4'Tim Jenssen2013-08-261-0/+1
|\| | | | | | | Change-Id: I9ee4395291754fd5a56555e1dd974df19ee39376
| * Add missing defineNiels Weber2013-08-221-0/+1
| | | | | | | | | | Change-Id: I9efb25286ea16e202fa93f068b19d92ba773cb01 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Bump versionNiels Weber2013-06-051-1/+1
| | | | | | | | | | Change-Id: Ica8abbb20a37cf18dd04fd40709b72b73fadcefc Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Version bumpNiels Weber2013-06-131-1/+1
|/ | | | | Change-Id: Ic731a9d53b5b7cea227b7d3ed06cbe7a2664a6ed Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* adding ConsumeOutputOperationTim Jenssen2013-06-031-0/+2
| | | | | | | | | | | - 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>
* introduce no_app_bundle.priTim Jenssen2013-05-271-1/+0
| | | | | | | - it tries to copy the needed qt_menu.nib dir Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-211-0/+2
|\ | | | | | | Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
| * Fix missing wizard icon on a windows static build.kh12013-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | Q_IMPORT_PLUGIN() macros are needed in application code only for Qt4, in Qt5 those are automatically generated by qmake. Change-Id: Ic75795be402592a0595bb3aa084d0b7ee9a9f8c5 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | bump versionNiels Weber2013-03-121-1/+1
|/ | | | | | | Change-Id: I6e57ba57223ba1902b820c2ffa944d3a4c6698b6 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Clean up Qt 5 build rulesKai Koehne2013-03-061-3/+4
| | | | | | | 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>
* remove configfile use for repogenNiels Weber2013-02-251-0/+2
| | | | | Change-Id: I54b9e59ad5d9d4092996fe5fd58157631c552f3f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Don't hard-code version in sourcesKai Koehne2013-02-141-1/+1
| | | | | | Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Don't hard-code version in documentationKai Koehne2013-02-141-0/+3
| | | | | Change-Id: Ib96057aa5103a80cbaacc27fe2330d481da70399 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Build statically if Qt was built staticallyKai Koehne2013-01-301-0/+22
| | | | | | | Change-Id: I47370bf3d30077ccfcc89ff705d0137875a8fc90 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Make IFW compile with mingw.kh12013-01-291-1/+3
| | | | | Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Build 7z static to suppress warnings inside there.kh12013-01-231-2/+3
| | | | | | Change-Id: Idcfec77f911f97358f8930c8f0d95fa1724daaeb Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Adjust to make it build with Qt5.kh12012-11-211-7/+6
| | | | | Change-Id: I697b6987da45d1afe7620e2114fd2d4bcf15c7ce Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Follow advice given by Joerg, DEPENDPATH is now deprecated.kh12012-11-201-1/+9
| | | | | 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-0/+1
| | | | | Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* remove unneeded RegisterDocumentationOperationtjenssen2012-09-281-3/+1
| | | | | | | Change-Id: I2e305383b6fe9d1578059ba8887a520874e04f10 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Revert "Fixes required for errorless MinGW-w64 compilation are done."kh12012-08-221-7/+6
| | | | | | | | 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-6/+7
| | | | | | 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-0/+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>
* Build tools, examples and test as extra target.kh12012-03-231-0/+1
| | | | | | Change-Id: Iae8949b3f938f5c6251a76b4806151e0262300d2 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Build and compile the resource on the fly.kh12012-03-221-0/+10
| | | | | | | | | 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>