summaryrefslogtreecommitdiffstats
path: root/tests/environmentvariable
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-302-34/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/installer/lib7z_create.h src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h src/libs/kdtools/localpackagehub.cpp src/libs/kdtools/localpackagehub.h src/libs/kdtools/updatefinder.cpp src/libs/kdtools/updatefinder.h tools/binarycreator/resources/mkdmg.sh Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
| * License header update to GPL-EXCEPTKatja Marttila2017-01-262-34/+24
| | | | | | | | | | Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-01-202-8/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h sync.profile Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
| * Update license headersIikka Eklund2015-12-292-8/+6
| | | | | | | | | | | | | | | | | | Update existing license headers. LGPL -> LGPLv21. Update copyright year as well. Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Make use of the new varadic template feature + cosmetic changes.Karsten Heimrich2015-07-101-2/+2
| | | | | | | | | | | | | | | | Change constructor to take the a package manager argument. Add a package manager member to the operation. Remove setter function. Change-Id: Iffb860e24089beb6496ac4ee479d547a29463728 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix broken auto-tests.Karsten Heimrich2015-05-051-4/+0
|/ | | | | | | | Still tst_PackageManagerCore is failing, though did so before this change too. Change-Id: Ib1f7bddb597676c58d00ff52d42ff7c9c7ba8ecd Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Don't put testresults into binNiels Weber2015-03-061-1/+0
| | | | | | | | | We don't want to package and ship them and they are not that useful apart from the test, so don't move them to the bin directory. Change-Id: Ic4f54389359779a41652eae84ce0b8789cc11dd7 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Update CopyrightKai Koehne2015-02-182-14/+14
| | | | | Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Add LGPLv3 as new licenseKai Koehne2014-10-162-28/+14
| | | | | | | Change-Id: I61158f956894e209dccf83744b4753774676099d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Some more Qt5 QT_VERSION fixes.kh12014-06-161-10/+2
| | | | | | Change-Id: I1b3596939cd4aca2b91da3f5b09f50f2639b6fbd Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* fix that QSKIP has one argument since Qt 5Tim Jenssen2014-01-221-2/+10
| | | | | | Change-Id: I134f61e1ea9a50264a155799d447965beaab14f9 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/+2
| | | | | | | - it tries to copy the needed qt_menu.nib dir Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix compilation of tests on LinuxKai Koehne2013-02-181-1/+0
| | | | | | Change-Id: If2277cb9dcacb1921eb7c01d14593dd5709feee6 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Change copyright headers from Nokia to DigiaSergio Ahumada2012-12-212-37/+55
| | | | | Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73 Reviewed-by: Karsten Heimrich <karsten.heimrich@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>
* Reorganize the tree, have better ifw.pri. Shadow build support.kh12012-03-191-13/+10
| | | | | Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix formating and build with QT_NO_CAST_FROM_ASCII.kh12012-03-161-2/+2
| | | | | | Change-Id: I00e4b1ec840d976dbfc7f0138726692a770aadba Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Keep common just for the tools.kh12012-03-131-2/+2
| | | | | | | All other files should be in the lib anyway. Fix includes. Change-Id: I654fadf0a77b8d19953a6b47820e6398af11e2df Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* clean up pro filestjenssen2012-03-131-2/+0
| | | | | Change-Id: I46dd8eff3a744099e0827573e6aee253ce149baf Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Move everything releated to testing into tests.kh12012-03-133-0/+175
Change-Id: I28fc488b3de03a8561888969336f2ebc62a97bb0 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>