Katja Marttila
9dacee18f9
Replace 0 with nullptr
...
Prevents a lot of warnings seen in QtCreator
Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-01-09 05:41:16 +00:00
Katja Marttila
9772474dd9
Merge remote-tracking branch 'origin/2.0'
...
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
2017-01-30 14:40:26 +02:00
Katja Marttila
c9d11cc991
License header update to GPL-EXCEPT
...
Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1
Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
2017-01-26 10:02:56 +00:00
Iikka Eklund
2af57eb8c8
Merge remote-tracking branch 'origin/2.0'
...
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
2016-01-20 14:18:30 +02:00
Iikka Eklund
6ba58b42ab
Update license headers
...
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>
2015-12-29 07:31:11 +00:00
Karsten Heimrich
38799ceaf1
Make use of the new varadic template feature + cosmetic changes.
...
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>
2015-07-10 08:54:06 +00:00
Karsten Heimrich
dc238c7ef4
Fix broken auto-tests.
...
Still tst_PackageManagerCore is failing, though did so before
this change too.
Change-Id: Ib1f7bddb597676c58d00ff52d42ff7c9c7ba8ecd
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-05-05 15:17:36 +00:00
Kai Koehne
99996591e0
Update Copyright
...
Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-02-18 10:33:48 +00:00
Kai Koehne
4ebfecf411
Add LGPLv3 as new license
...
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>
2014-10-16 15:17:56 +02:00
kh1
0c478e02cb
Some more Qt5 QT_VERSION fixes.
...
Change-Id: I1b3596939cd4aca2b91da3f5b09f50f2639b6fbd
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-06-16 17:56:39 +02:00
Tim Jenssen
54409e9701
fix that QSKIP has one argument since Qt 5
...
Change-Id: I134f61e1ea9a50264a155799d447965beaab14f9
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-01-22 15:52:26 +01:00
Sergio Ahumada
8f4053db30
Change copyright headers from Nokia to Digia
...
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-12-21 22:25:29 +01:00
kh1
f60c03d5bb
Fix formating and build with QT_NO_CAST_FROM_ASCII.
...
Change-Id: I00e4b1ec840d976dbfc7f0138726692a770aadba
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-16 17:40:27 +01:00
kh1
342f67fa85
Move everything releated to testing into tests.
...
Change-Id: I28fc488b3de03a8561888969336f2ebc62a97bb0
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-13 11:43:41 +01:00
