58 Commits

Author SHA1 Message Date
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
kh1
05afd837fc Replace client-server classes and update implementations.
Remove superfluous file engine tests. Introduce auto test
for newly added client server classes. Fix some wrong
implementations serverside for settings array handling and
broken arguments in process wrapper. Replace all other parts
that with new implementations. Remove now unused classes.
Change-Id: I6f9e836993096a2c2c06b06f2b06d7aa4b287e56
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-03 13:04:53 +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
kh1
ffa1ceb120 Fix component still visible after it's set "Virtual".
Task-number: QTIFW-466

Change-Id: I6a5e4d0d20703e2d4e867bb2619c82dac0b8a64c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-05-16 10:29:39 +02:00
kh1
31a0f80573 Adjust ProductKeyCheck API. (in preparation for multiple pages)
Change-Id: I69d0fc9842df7fb564db57067da5f40e002b61de
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-11-25 16:53:33 +01:00
Tim Jenssen
e14d0b31bc Merge remote-tracking branch 'origin/1.4' into 1.5
Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8
2013-11-06 17:06:15 +01:00
Tim Jenssen
016cdad413 Restart on the wizard needs to cleanup component left-overs
- use two different script engine instances
    - one which lives from the beginning -> the controlScriptEngine
    - the other one which will be reset if there are some new repositories
      loaded
  - now the core has a pointer to the gui object, but it should only be
    used by the script engine so a QObject type should be enough
  - engines are deleted as QObject children from the PackageManagerCore
  - registered downloaded archives are removed

Change-Id: I60a4a32fb2e409059839ec11b10c57357454f57a
Reviewed-by: Michal Klocek <michal.klocek@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-11-06 16:51:35 +01: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
Michal Klocek
a82c1bd8df Fix not moving uninstallation progressBar
Set 'component' name value for minimalprogressoperation.
 Wihout the value sortOperationsBasedOnComponentDependencies
 puts the operation to execute as the last one.
 This creates 'freeze' of uninstallation bar

Change-Id: I3b894b2c48ed5008d1d265084451da6fc4e3ef86
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-09-17 13:27:39 +02:00
Michal Klocek
6e798a3a7a Minor. Fixes unregistered type warning.
register QList<QInstaller::Component*>

Change-Id: I1329ccc9c7ad3405b3a995fb40cc77688953744a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-09-13 13:55:36 +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
bf8651f8a4 Display release date in Updater and Packagemanager
Task-number: QTIFW-25

Change-Id: I8c4d4ac3983b40afd3072fa36dec348b9c67f1d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-19 11:20:15 +02:00
Kai Koehne
4c7a57bf2a Remove deprecated Qt specific operations
Change-Id: Iac895970420cfe1d70b1b0fde5f5a7c33dd1bbb0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-12 13:13:15 +02:00
kh1
d4642f3ff2 Fix update component selection shows wrong package sizes.
Task-number: QTIFW-302

During the update of KdTools we removed a bit to much code, so the
compressed/ uncompressed size was never passed to the component. Now
we keep and set it properly again. Force an update of the uncompressed
component size once we have calculated all checked components.

Change-Id: I12a796b543bbacdef4fbbdac10ff1103612c4c61
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-30 11:42:52 +02:00
Tim Jenssen
9ea0a22fb0 add component name to operation debug output
- set the component name to every operation which comes from
    a component

Change-Id: I3e4a1ab2896f7b469fe6606c7e89127c3d6fbc43
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-07-26 13:19:24 +02:00
Tim Jenssen
8aaa032159 rename operation to operationName
Change-Id: I6e8f87b40f0bac3a6e50b923cf260f721abc9e07
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-07-26 12:56:42 +02:00
Tim Jenssen
72dfa6df1e Merge remote-tracking branch 'origin/1.4'
Conflicts:
	installerfw.pri
	tools/binarycreator/binarycreator.cpp
	tools/common/repositorygen.cpp
	tools/common/repositorygen.h
	tools/repogen/repogen.cpp

Change-Id: I97767b2e4ef9b7afd5ce368d99c6a7d38dfbd947
2013-06-27 11:20:29 +02:00
kh1
5e5c0a10ff Implement dedicated translation settings support.
Change-Id: I41dd23f01e9b511c217fee7f736d9187b8a8623a
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-26 11:55:19 +02:00
Kai Koehne
b38573f2da Do not use don't, can't ... in output
Don't, Can't, etc abbreviations are used in informal speech. This is
okay in code comments etc, but user output should use the correct,
non-abbreviated terms.

Change-Id: I53c0dfa91596c151bfa7ef7b65f57d5084ceccde
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-20 12:36:03 +02:00
Tim Jenssen
52a115400a fix designer warning
- MessageBoxHandler::currentBestSuitParent() is a QWizard in most cases
    and then it tries to add QWidgets to it, but it allows only QWizardPage
  - this results in a memory leak of the translatewatch objects inside the
    loader, but needs to be fixed in the QUiLoader see QTBUG-31818

Change-Id: I67b0cc78c3843d4bbe70f015a63b5c26bb7f9e2c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-06-18 12:54:10 +02:00
Tim Jenssen
955db4b749 rename method in productkeycheck
- isValidLicense(fileName) -> isValidLicenseTextFile(fileName)
 - so we don't confuse user with hasValidKey

Change-Id: Ife2a88f244a75238dec5d70c280e6b4331a34a8a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-31 14:23:51 +02:00
kh1
4673422843 Cleanup KDTools from stuff we do not use at all.
Change-Id: I62d5ec103aafe7f2f4a497cc339271bdb33a8f92
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-05-29 16:46:34 +02:00
Tim Jenssen
db47e1e10b fix unknown component value in scripts while updating
- the order of initializing the updatercomponents list was different
   then the packagemanagercomponents list
 - now every updatercomponents are inside the list before the scripts
   are called

Change-Id: I2cfa8edb48326071f6976aa9f772afc477088719
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-21 12:18:17 +02:00
Tim Jenssen
6e48c0e9e2 forward packagemanager core to ProductKeyCheck class
- with this the outsourced product key check code can
   enable, disable or even add repositories

Change-Id: I390251b7f3bfa29a6f39a9ac44aa55ec15f780a2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-17 14:07:23 +02:00
Tim Jenssen
06449248ab introduce installerscriptengine
- it uses one scriptengine for everything and adds the components
   or/and the install-controller in javascript closure contexts
 - added the gui object to the component script context
 - removed tabController from controlscript context

Change-Id: I3bd6c5dcf470666c30add1b7d04a8fdd094f5f11
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-16 16:12:52 +02:00
Tim Jenssen
e3bd8afc6b add installerscriptengine autotest
Change-Id: I662c22ea8fc1276c78abedd037f51f4afb08271f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-07 14:31:18 +02:00
Sergio Ahumada
c7f9289af6 Some minor Nokia -> Qt Project changes
- Updating the supported platforms link
 - changing com.nokia -> org.qt-project

Change-Id: Ib74fda09f177a989b79288b967423ef04c16786e
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-04-30 13:05:14 +02:00
Tim Jenssen
e33ae70bcc remove not needed debug output
Change-Id: I44720577b7e13841506f8696c59686bdcabde099
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-04-30 10:43:36 +02:00
Kai Koehne
20fc67fdf1 Add documentation for JS API
Change-Id: Ifef70bf0ef12b90972186f64ff9b0ae602f14420
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-04-23 16:33:47 +02:00
kh1
1d63431abb Throw if we can't load the requested UI file.
Change-Id: Iced4d4649a386a18efabe80dc094461e7b1b1a74
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-03-25 22:01:54 +01:00
Niels Weber
4fea99088a Make deprecation warning less insane.
"Multiple exclamation marks," he went on, shaking his head,
"are a sure sign of a diseased mind."

Change-Id: If8e39435db5962cea0bc2e5fa372389198f5d14f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-03-20 10:26:59 +01:00
kh1
0249980607 Use Q_GLOBAL_STATIC{_WITH_ARGS} following Qt coding conventions.
Move the regexp into its own compilation unit, so we get it only
once and use a accessor to fetch the value. I guess we should do
the same with the constants file, as all strings get compiled in
the file including it. At least Ossi wasn't satisfied currently.

Change-Id: Ic495a82f4b3cfe7810523b12cd3ef255eb15f149
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-18 11:39:18 +01:00
Tim Jenssen
de8d24fa6c Merge remote-tracking branch 'origin/1.3'
Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
2013-03-12 15:10:15 +01:00
Tim Jenssen
9e4194a900 added first version of a product key checker API
This is more temporary solution to be able to use
the 1.3 for new Qt releases.

Change-Id: Ic28c75547da7d4d0c2efcca08cdbd76f4a0ad9f6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-03-11 11:44:29 +01:00
Tim Jenssen
80a121f6d1 Merge remote-tracking branch 'origin/1.3'
Change-Id: Ifb2048c4e820735ae8df05e2603b50fbeaf604d2
2013-03-05 16:18:27 +01:00
Tim Jenssen
26bcc99834 filter sha1 files in createArchive script call
Change-Id: Ibc91cfae6d860d69b95f33a9fe12c0518e522792
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-05 15:16:40 +01:00
kh1
9e8a2a2516 Get rid of some superfluous includes.
Change-Id: Id2d6252d8e7be5bcd2bcf82962d293e8de7e2563
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-03-04 13:02:54 +01:00
Tim Jenssen
69060b4eb3 Merge remote-tracking branch 'origin/1.3'
Change-Id: Ia37c543d1199ad4ddc37ff6b14c2806c03a8009f
2013-02-21 14:43:13 +01:00
kh1
3f7b8b05ca Compile fix.
Change-Id: Iea2237923ec0fae9d3b3df02b70abb4a0f2d79cb
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-02-20 11:26:53 +01:00
kh1
2635cb74cf Fix boolean parameter which lead to less readable code.
Change-Id: Ie680654f39fce130c607929f98db372dbe3c6ea1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-20 11:18:26 +01:00
Tim Jenssen
5c2d700cb1 Make Virtual and Default tag mutually exclusive.
Call m_vars value function directly.
1; To prevent recursive calls in case of key "Default".
2; To avoid the extra function call to fetch values from m_vars in
   case of other values set in the object.

Change-Id: I8f40b53704d1f314071d7060d0c92829310c262d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-02-20 11:17:42 +01:00
kh1
8092e35494 Remove RunMode enum, it's useless and clutters the API.
Change-Id: I4323a0d66bda362ccee71a19352c37c9ac1b51e1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-02-19 15:43:04 +01:00
Niels Weber
aa37d582dc Add 2013 to the copyright.
Change-Id: If64730ba7203d1a910a426c0d9c9a738ecfeff4b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-02-05 11:24:14 +01:00
Ivan Komissarov
db1d63549f Change license encoding to utf-8.
Task-number: QTIFW-207

Change-Id: I5cc63fa8e9718245b972098b457fb261c6a54b5c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-01-24 12:49:24 +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
40b40e6274 Finally IFW compiles with Qt5 (use private headers)
Change-Id: I2604c77418e4a930bd0f76092db581fef1e45817
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-07 13:15:35 +01:00
tjenssen
0d8574a8d4 remove unused removeBeforeUpdate functionality
Change-Id: I0e947c11d393d2aa1d9a97a2d9cd32790f4d2954
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-11-20 16:22:47 +01:00
kh1
311045065e Some changes to start compile with Qt5.
Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-20 10:40:47 +01:00
kh1
a1b2010ce8 Sort the child components.
The higher the value, the higher up in the list the component
is ordered. Currently we handled it the opposite, thus we had
to assign every component a value to get sorting work.

Change-Id: I6003cb95b69ba4160eb822565edf120dd0f0543f
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-10-01 12:12:51 +02:00