Commit graph

154 commits

Author SHA1 Message Date
Ivailo Monev
026aefb6bd declare JSON types as core meta-types
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 18:49:10 +02:00
Ivailo Monev
adb184a208 add several QList::reserve() calls
upstream commits:
552fba2386

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 18:48:10 +02:00
Ivailo Monev
c9a4ea5450 remove some Symbian leftovers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 18:09:27 +02:00
Ivailo Monev
c4eb3a3ead don't inherit parent context's
upstream commits:
68458376c0

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 17:38:44 +02:00
Ivailo Monev
d777651253 fix QScriptContextInfo::functionMetaIndex() for overloaded slots
patch applies by hand

upstream commits:
d08de20171

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 17:35:00 +02:00
Ivailo Monev
020b98780f don't crash in debugger if QScriptEngine is deleted
upstream commits:
0a4e802f18.patch

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 15:49:16 +02:00
Ivailo Monev
e012cdc1a0 fix some compiler warnings about unused functions
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-12 15:25:50 +02:00
Ivailo Monev
ac1624df8e remove unused numberToString() method from qml parser
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 23:40:34 +02:00
Ivailo Monev
4fb884a856 remove QColorGroup remains
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 19:51:19 +02:00
Ivailo Monev
a5b6b98cb4 make QScriptEngine::uncaughtExceptionBacktrace() work again
upstream commits:
df0ec19603
9429a85a21

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 19:01:06 +02:00
Ivailo Monev
c4f95f49d7 remove WebKit remains
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 17:50:39 +02:00
Ivailo Monev
2696a019b6 misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 17:42:52 +02:00
Ivailo Monev
862cbef87d remove Q3 style remains
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 17:26:33 +02:00
Ivailo Monev
f0a7f5dabc remove old GUI component headers (2)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 16:36:26 +02:00
Ivailo Monev
487c2a9e80 remove old GUI component headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 16:29:58 +02:00
Ivailo Monev
d909d138e9 remove old core component headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 16:26:18 +02:00
Ivailo Monev
c69de01a79 remove old XML component headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 16:17:08 +02:00
Ivailo Monev
6652523780 cleanup Q3* items
upstream commits:
e7adaed529 (diff-12177534fb7e42a7bdf69e81ca5cfb99L1183)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 15:09:32 +02:00
Ivailo Monev
4f7a725ee5 remove use of obsolete QStyleOption*V<N>
upstream commits:
80d7b19b80

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 14:24:34 +02:00
Ivailo Monev
bc9930689c merge QStyleOption*V{2,3,4} classes together
upstream commits:
3578e05b29

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 14:17:16 +02:00
Ivailo Monev
85ba1c5877 remove some Q3 support remains
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 12:43:48 +02:00
Ivailo Monev
2298738735 remove code for non-OpenSSL linked build
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 00:21:23 +02:00
Ivailo Monev
a66eaa8870 remove unused 'connectTimeElapsed' member
upstream commits:
9f74b840f9

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 00:05:45 +02:00
Ivailo Monev
9202e9fa7a Merge branch 'master' of https://github.com/fluxer/katie 2016-01-11 00:02:05 +02:00
Ivailo Monev
31c620ea32 remove declaration of method nowhere defined
upstream commits:
e5724533e4

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 00:01:00 +02:00
Ivailo Monev
3cb92b865f Debian package file fixes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 16:11:10 -05:00
Ivailo Monev
115d268e24 add (experimental) Debian package files
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 22:12:38 +02:00
Ivailo Monev
0e4b0509c8 fix copy-paste mistake in PulseAudio CMake module
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 21:06:33 +02:00
Ivailo Monev
959340d2ca adjust phonon component to recent PulseAudio CMake module changes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 21:01:23 +02:00
Ivailo Monev
5a9e3319b2 do not require NAS on Arch Linux
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 14:56:30 +02:00
Ivailo Monev
4205a2ec19 rework KATIE_SETUP_SOURCES CMake macro
now that the assembler language is enabled in the build system the macro
turned out to be a bit bogus and it has to handle sources control too
because some CPU specifiec sources were, previously, added unconditionally
to targets leading to build failures (especially with assembly).

CPU tests now declare variables that are cached and can be changed by the
user to avoid touching parent scope from the test macros (previously
functions for that reason).

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 14:53:19 +02:00
Ivailo Monev
bc4cd78da8 set CPACK_PACKAGE_CONTACT for DEB generator
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 01:26:16 +02:00
Ivailo Monev
bd7b59f74f fix build without CUPS
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 00:47:47 +02:00
Ivailo Monev
1cf997dde5 enable assembler language for the build, not needed for now
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 00:30:42 +02:00
Ivailo Monev
ef8c202c4c improve GLib2 and D-Bus detection 2016-01-10 00:06:18 +02:00
Ivailo Monev
223d0b4567 rewrite some CMake modules, improve others
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 23:55:09 +02:00
Ivailo Monev
df31068ba9 remove QMetaObjectExtraData and put everything into QMetaObject
upstream commits:
67f58040ea

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 19:55:15 +02:00
Ivailo Monev
1ba689a9cd remove qt3 remains from uic tool
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 19:21:58 +02:00
Ivailo Monev
19c3d3439c remove support for legacy uic3 from designer component
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 18:59:46 +02:00
Ivailo Monev
cce9b525e6 do not build utilities by default
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 18:52:14 +02:00
Ivailo Monev
2a9abe2adb initialize dynamic meta object extradata
upstream commits:
979cb5a09e

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 17:16:52 +02:00
Ivailo Monev
2388dc8e17 bring QtDBus meta-object generator in sync with moc
upstream commits:
4ec2b37542

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 15:40:41 +02:00
Ivailo Monev
a396feff1d flag meta objects generated by QtDBus
upstream commits:
78cf553469

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 15:32:46 +02:00
Ivailo Monev
3a479bd2ac sync metaobject builder with moc
this includes a few upstream changes as well as a few of my own as I'm not
convinced that it should be merged into the core module yet as is done in
Qt5. the important thing is that debug builds will no longer cause assert.

upstream commits:
b184dd0a01
0cb7a66989

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 15:18:17 +02:00
Ivailo Monev
357110ccf6 avoid duplicating flags/types in qmetaobjectbuilder
upstream commits:
d30515104d

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 13:06:43 +02:00
Ivailo Monev
99c1ef0f89 rewrite translations script and update the trranslations 2016-01-09 12:55:18 +02:00
Ivailo Monev
4016b14a9b rewrite GLib2 CMake module, minor build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 00:40:52 +02:00
Ivailo Monev
7a38466cec replace operator with a directive in qmap
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-08 18:05:45 +02:00
Ivailo Monev
3c30575030 fix yet another instance of QmlJsParser
upstream commits:
b1da4fb044

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-06 21:28:03 +02:00
Ivailo Monev
fb59e641d4 normalize signatures for signals and slots via the utility
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-06 21:22:52 +02:00