47 Commits

Author SHA1 Message Date
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
Tim Jenssen
3d9fc71e89 Merge remote-tracking branch 'origin/1.3'
Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
2013-03-21 17:04:32 +01:00
kh1
4cde7b2ed6 Fix missing wizard icon on a windows static build.
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>
2013-03-21 16:30:49 +01:00
Niels Weber
ea29068e34 bump version
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>
2013-03-12 16:45:42 +01:00
Kai Koehne
61f5549578 Clean up Qt 5 build rules
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>
2013-03-06 14:37:44 +01:00
Niels Weber
9561e4cd61 remove configfile use for repogen
Change-Id: I54b9e59ad5d9d4092996fe5fd58157631c552f3f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-02-25 11:44:25 +01:00
Kai Koehne
bf2300a1cd Don't hard-code version in sources
Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-02-14 13:11:55 +01:00
Kai Koehne
930a088c78 Don't hard-code version in documentation
Change-Id: Ib96057aa5103a80cbaacc27fe2330d481da70399
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-02-14 13:11:40 +01:00
Kai Koehne
525a757158 Build statically if Qt was built statically
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>
2013-01-30 16:22:23 +01:00
kh1
8633d999d6 Make IFW compile with mingw.
Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 11:12:24 +01:00
kh1
d5faa7a028 Build 7z static to suppress warnings inside there.
Change-Id: Idcfec77f911f97358f8930c8f0d95fa1724daaeb
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-01-23 11:09:21 +01:00
kh1
541399200a Adjust to make it build with Qt5.
Change-Id: I697b6987da45d1afe7620e2114fd2d4bcf15c7ce
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-21 17:53:20 +01:00
kh1
402aab76a6 Follow advice given by Joerg, DEPENDPATH is now deprecated.
Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-20 15:27:48 +01:00
Tim Jenssen
4917152126 remove app_bundle config only if it is a static build on Mac
Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-11-09 08:59:36 +01:00
tjenssen
6588ca8baa remove unneeded RegisterDocumentationOperation
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>
2012-09-28 13:46:09 +02:00
kh1
27c1445c9f Revert "Fixes required for errorless MinGW-w64 compilation are done."
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>
2012-08-22 09:59:49 +02:00
tjenssen
9cad5d54cf Fixes required for errorless MinGW-w64 compilation are done.
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-08-10 13:12:47 +02:00
Tim Jenssen
99e489c191 fix openpty static link problem
- 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>
2012-06-12 15:34:55 +02:00
kh1
b9920bf160 Build tools, examples and test as extra target.
Change-Id: Iae8949b3f938f5c6251a76b4806151e0262300d2
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-23 16:04:15 +01:00
kh1
c885048967 Build and compile the resource on the fly.
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>
2012-03-22 16:20:52 +01:00
kh1
be3b47d0d5 Reorganize the tree, have better ifw.pri. Shadow build support.
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-19 16:14:04 +01:00