Commit graph

7150 commits

Author SHA1 Message Date
Ivailo Monev
dc84942128 allow inclusions of multiple resource generated files from one source file
you will see the use case for this in the all-in-one build of deviceskin
once I push the changes to make use of it

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 23:18:28 +00:00
Ivailo Monev
41f1500637 mostly build system changes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 21:24:47 +00:00
Ivailo Monev
cca2d22965 all-in-one build fixes for designer component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 18:05:03 +00:00
Ivailo Monev
3dc65db9de qtgradienteditor can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 18:03:18 +00:00
Ivailo Monev
dd4c895063 designer tool can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 17:19:33 +00:00
Ivailo Monev
3dd251226f enable all-in-one in Travis
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 16:43:36 +00:00
Ivailo Monev
f263db8ffb help component can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 16:32:34 +00:00
Ivailo Monev
2656915164 fixup the paths in the pkg-config files
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 16:03:37 +00:00
Ivailo Monev
b9461f901a do not blacklist KtCore from all-in-one build now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 14:39:13 +00:00
Ivailo Monev
e0c70f75b7 Merge branch 'master' of https://github.com/fluxer/katie 2016-08-26 14:37:58 +00:00
Ivailo Monev
31ccaee366 core component can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 14:36:42 +00:00
Ivailo Monev
358e8b9a84 lupdate tool can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 04:22:48 +03:00
Ivailo Monev
5f6e198887 fix all-in-one build of network component on Windows [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 02:49:10 +03:00
Ivailo Monev
c5f8f5de09 fixup build of main component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-26 02:42:53 +03:00
Ivailo Monev
2c3aabd1a3 mostly all-in-one build fixes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 21:33:15 +00:00
Ivailo Monev
f1d4aa0092 network component can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 20:50:39 +00:00
Ivailo Monev
0c75a5a225 test component can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 19:05:43 +00:00
Ivailo Monev
4af405fd83 scripttools component can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 18:15:32 +00:00
Ivailo Monev
fd74c45a85 script component can be build as all-in-one now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 16:54:21 +00:00
Ivailo Monev
313e1b79d0 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 15:37:12 +00:00
Ivailo Monev
df9ce31cc6 fixup package target [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 06:26:14 +00:00
Ivailo Monev
6bea2e71e4 cleanup katie_setup_target()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 05:17:02 +00:00
Ivailo Monev
916bc985f0 goodbye custom flags, Mac OS X build is broken cuz frameworks
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 05:00:31 +00:00
Ivailo Monev
8e2525fb74 rework katie_setup_targets() and bump minimum CMake requirement
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 04:39:23 +00:00
Ivailo Monev
3053abb40a oops, fixup katie_resources() usage in katie_test()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 03:07:24 +00:00
Ivailo Monev
42f492cf7c preparations to support all-in-one targets build
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-25 02:56:09 +00:00
Ivailo Monev
340a4efa74 headers compat werk
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-23 20:33:21 +00:00
Ivailo Monev
90f41f16a4 QStringList must be exported now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-23 17:45:06 +00:00
Ivailo Monev
ec7b25649c mostly QStringList cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-23 14:05:34 +00:00
Ivailo Monev
49fc1b6222 merge qMemEquals and ucstrncmp
some of the changes are my own, the first hunk did not apply clean too

upstream commits:
2cfdb35269

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-23 04:29:21 +00:00
Ivailo Monev
2b41db9326 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-23 01:19:49 +00:00
Ivailo Monev
07d5cc27bf correct generation of qscopedarraypointer.h under QtCore sub-directory
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 21:29:42 +00:00
Ivailo Monev
2b09338381 use the same hash for 8 bit strings as in QByteArray
upstream actually uses QLatingString, but anyway

upstream commits:
8fca1e70e7

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 21:02:29 +00:00
Ivailo Monev
5bbdc63f16 correct generation of customwidget.h under QtDesigner sub-directory
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 20:59:22 +00:00
Ivailo Monev
ee046cdbb6 minor cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 19:29:19 +00:00
Ivailo Monev
cb400eda5b headers compat werk
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 19:29:11 +00:00
Ivailo Monev
f184f58bc6 allocating the rasterizer pool out of gray_raster_reset() is safer
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 14:03:40 +00:00
Ivailo Monev
88180bd6bf update translations
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 03:19:53 +00:00
Ivailo Monev
8305cbc2fd there is no reason to use getpwuid_r() in the session manager AFAICT
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 03:04:10 +00:00
Ivailo Monev
2dff72714d mostly rasterizer cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-22 01:26:43 +00:00
Ivailo Monev
f8897622dc various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 18:37:25 +00:00
Ivailo Monev
227c5a76d9 oops
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 03:37:28 +00:00
Ivailo Monev
9d4694ca54 generate obsolete qxmlstream header for xml component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 01:36:19 +00:00
Ivailo Monev
072536638b parse classes that use Q_DECL_FINAL|final|sealed
Q_DECL_FINAL is not in Katie yet

upstream commits:
80694dd614

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 01:31:23 +00:00
Ivailo Monev
8a0b955b91 remove duplicated code from moc generator
upstream commits:
4a8ce53ad6

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 01:30:25 +00:00
Ivailo Monev
be06be1b56 deal with xml streaming API headers
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 00:53:06 +00:00
Ivailo Monev
245f759bb4 partitial backport of Q_UNREACHABLE()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 00:25:56 +00:00
Ivailo Monev
38e657200f backport Q_COMPILER_NULLPTR and Q_NULLPTR
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 00:14:26 +00:00
Ivailo Monev
d97a0f33d8 headers comapt werk
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-20 19:04:58 +00:00
Ivailo Monev
1482d763a4 no need to forward declare QLIst from qmetaobject header
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-20 17:52:57 +00:00