summaryrefslogtreecommitdiffstats
path: root/installerfw.pri
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* Reorganize the tree, have better ifw.pri. Shadow build support.kh12012-03-191-0/+57
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>