70 Commits

Author SHA1 Message Date
Katja Marttila
818c8ab983 Prepare 3.1 release
Change-Id: I544869f1fe344ca076e23dc7809dc14aecf6ea3d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-04 10:36:28 +00:00
Katja Marttila
741d16a9bd Merge remote-tracking branch 'origin/3.0'
Change-Id: Id2e682dc2698e08f91bee83e2a94de57403545a0
2017-09-25 09:03:06 +03:00
Jake Petroules
0089d7b3b7 Always build libinstaller as a static library
This fixes the build if IFW is built with a dynamically linked Qt, and
does not otherwise affect use of static builds of Qt.

Task-number: QTIFW-993
Change-Id: I1e6807e522adde339263c697fa4a1353250a2e3f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-09-13 04:01:29 +00:00
Katja Marttila
947ca71af0 Prepare 3.0.1 release
Change-Id: I799de5aa50040aea159d9f13209e73d19ffed9d7
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-06-26 06:11:42 +00:00
Katja Marttila
4d37184b10 Merge remote-tracking branch 'origin/3.0' into master
Conflicts:
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri

Change-Id: Ifaac76cd06737167a908baba5e554bedddd0e5ae
2017-05-24 09:02:32 +03:00
Katja Marttila
f0c0a66810 Fix ld warnings in macOS
Change-Id: I6f5b98bdd2a5997f6549219393570d6db09bbad0
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2017-05-23 06:05:30 +00:00
Katja Marttila
08be880705 Prepare 3.0.0 release
Change-Id: I6e7c58bd9ad958a65729b6b8cd55f2958fe92aed
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-05-15 09:19:40 +00:00
Konstantin Podsvirov
97498e486a Begin 3.1 version development
Change-Id: Idd6e89a09a539eb9d6d6b1271738bd8ba774cce6
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-04-11 10:49:43 +00:00
Konstantin Podsvirov
a474d0ba7c Bump major version number to 3
Change-Id: If4cf94a34fd6ac22bed94fe8bb508c429ef82fe3
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-03-30 04:35:00 +00:00
Katja Marttila
c24d9312c2 add NOMINMAX to fix compile with Qt5.7 in Windows
Task-number: QTIFW-854
Change-Id: I73cb2a40d59803050c1b8f729e22a4caebcab724
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-20 14:09:09 +00:00
Katja Marttila
38f11dbeb4 Fix building with ICC on Windows
Task-number: QTIFW-851
Change-Id: Ic92e24cc2d5046aca3ec81843c00aa3c52288a4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2016-05-03 12:47:08 +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
7ff35d7b68 Add alternative option where to read the installer-framework sha1
The "--version" uses the sha1 of the git checkout of the
installer-framework.

This works when making the build from git checkout.

For Coin (continuous integration) the installer-framework builds are
made from stored src packages where the .git directory is not present.

In this case read the sha1 from the .tag instead which is present in
the Coin produced src packages.

Change-Id: Ic6387c844699f4410c043a4df84727bb5c1108ae
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-04 06:35:09 +00:00
Kai Koehne
1611812a62 Version bump
Change-Id: Ic11a894ef21f4dd2967a3fd662fad8a30f11ba7e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-06-16 11:14:00 +00:00
Kai Koehne
25ec075535 Bump version number
Change-Id: I78552ac9b88fd02828966e71ddafd25a3075535e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-08 12:07:42 +00:00
Kai Koehne
c3f5744d2e Don't mix iterator and const_iterator
Add QT_STRICT_ITERATORS to disallow implicit conversions
between iterator and const_iterator. This avoids potential
detaches of the Qt containers.

Change-Id: I79d381f531ddda9ac402c6f5c63cdc7c6808a0bd
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-08 08:36:57 +00:00
Kai Koehne
711c579ffa Merge remote-tracking branch 'origin/2.0'
Conflicts:
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri

Change-Id: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
2015-01-21 10:14:50 +01:00
Kai Koehne
6e76754954 Bump version number
Change-Id: I0d6afa57054d012cd23e6364a32ca2485741a784
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-19 10:13:31 +01:00
Kai Koehne
515b96469d Bump version number
Change-Id: I84bb6a1f7c2a6e882657f7c0473211b94997ace8
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2014-12-10 13:13:09 +01:00
Kai Koehne
c8ed41495f Allow to check for IFW version in code
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>
2014-11-11 16:51:39 +01:00
kh1
520a9f300f Implement progress indicator on taskbar on Windows.
Task-number: QTIFW-15
Change-Id: Ia11c185f25dff2f1614425ec5ff78e79b2fa2a77
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-11 11:11:45 +02:00
Kai Koehne
56f2255eef Enable QStringBuilder
QStringBuilder improves the speed of string concatenation a lot ...

Change-Id: I9dedf7c3335ebf4a9194e837f9eb8135fae11356
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-19 17:33:45 +02:00
Kai Koehne
37a498b903 Enable C++11 mode in compilers
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>
2014-06-19 17:33:15 +02:00
kh1
be18e0488b Remove superfluous Qt4 code.
Change-Id: I0bd609dec191fdf65fb2370cd68291e87ae62750
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-06-04 11:23:24 +02:00
Kai Koehne
807de076f4 Fix qmake warning about "Redundant entries in QTPLUGIN"
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>
2014-06-04 10:15:15 +02:00
kh1
82ca2e544f Master needs at least Qt 5.3.0.
Change-Id: I3bdd1c80d6709b0ef92f8d2bc8cab16fe7ed62b6
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-03 16:37:41 +02:00
kh1
8addcf763b Replace script with js engine.
Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-03 10:51:51 +02:00
kh1
e89721bce1 Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-06-02 09:57:13 +02:00
Kai Koehne
09c3bf53a5 Update version number
Change-Id: Id67d098d554030aa3c8425ad306eed72a187f771
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-04-04 09:00:30 +02:00
Oswald Buddenhagen
1f8ec5b6a4 Merge remote-tracking branch 'origin/1.5'
Conflicts:
	installerfw.pri

Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
2014-03-27 16:44:41 +01:00
Niels Weber
96235d9b95 Add lconvert to pri file.
Change-Id: I09da477700da81a4fd678b959553e2078b8c1bc0
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-03-19 10:55:31 +01:00
Niels Weber
e724e6180c Bump version
Change-Id: Ie693487fd2d2c6fd5c60955b2face7eb2e58ac94
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-06 10:42:24 +01:00
Niels Weber
e04464602c Silence private header warning.
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>
2014-02-17 12:35:53 +01:00
Takumi Asaki
038001bda0 Add ts-<lang>, ts-all, commit-ts rules for translations
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>
2014-02-10 10:55:26 +01:00
kh1
e15fe10836 Compile fix after native separator change.
Change-Id: I3044637a65b87483dd9ded63920adb5536952700
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-04 11:35:33 +01:00
Takumi Asaki
303d245db9 Fix: Path handling in project files
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>
2014-02-03 15:42:44 +01:00
Niels Weber
ca864f3c1f Bump version number
Change-Id: I22bda59c70f54336d82dc9bbbedf9330b47478c8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-01-29 12:45:09 +01:00
Tim Jenssen
c96138df9b increase version to 1.5
Change-Id: Ia128e8b214835052507d79348714efc947f72f15
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-10-25 16:07:59 +02:00
Tim Jenssen
876f53921d Build installers with accessibility plugin
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>
2013-10-25 16:07:49 +02:00
Tim Jenssen
7778787b91 Merge remote-tracking branch 'origin/1.4' into 1.5
Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
2013-10-23 17:09:23 +02:00
Tim Jenssen
047844cddf Fix possible crash. Disable close button during installer run.
Change-Id: I6a0affab7394e3ae9669904bbfc48617b5cb1bd5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-09-30 10:49:56 +02:00
Michal Klocek
79c1b8646f Check for mingw-gcc vs mingw-msvc when checking dependences
Fixes wrong library naiming when running with mingw-gcc

Change-Id: Id8bf210f1a119e296a212a9d0570a4c918e780c5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-09-18 17:35:44 +02:00
Michal Klocek
f8d48bd39c Fix incremental builds
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>
2013-09-17 17:51:43 +02:00
Kai Koehne
9c61e394e8 Bump version
Change-Id: Ie18e88bb65a8765afdd3e1e8767ad0cb9b584d77
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-29 16:10:30 +02:00
Tim Jenssen
d8d93f85d6 Merge remote-tracking branch 'origin/1.4'
Change-Id: I9ee4395291754fd5a56555e1dd974df19ee39376
2013-08-26 12:24:11 +02:00
Niels Weber
90bacf8841 Add missing define
Change-Id: I9efb25286ea16e202fa93f068b19d92ba773cb01
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-08-22 13:22:09 +02:00
Niels Weber
804afe6f01 Version bump
Change-Id: Ic731a9d53b5b7cea227b7d3ed06cbe7a2664a6ed
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-06-13 13:59:53 +02:00
Niels Weber
2295e0e635 Bump version
Change-Id: Ica8abbb20a37cf18dd04fd40709b72b73fadcefc
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-06-05 11:16:27 +02:00
Tim Jenssen
c2cfa6dd83 adding ConsumeOutputOperation
- 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>
2013-06-03 16:35:23 +02:00
Tim Jenssen
d1bb751a38 introduce no_app_bundle.pri
- it tries to copy the needed qt_menu.nib dir

Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-27 15:44:09 +02:00