Commit graph

102 commits

Author SHA1 Message Date
Ivailo Monev
3c58788f05 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2018-07-10 14:31:23 +00:00
Ivailo Monev
fc1e08ddf6 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-08-08 13:01:02 +00:00
Ivailo Monev
adf0b81bf9 make it possible to build bootstrap_moc/moc as all-in-one
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-08-03 07:12:14 +00:00
Ivailo Monev
c4719a248f install manual pages as part of Doc component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-07-16 07:02:53 +00:00
Ivailo Monev
09cfa4c936 minor moc cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-05-07 16:45:38 +00:00
Ivailo Monev
afd3e0ddf2 take the upstream apporach for fixing define token processing
while it seemed logical to stop processing if there are no braces after
the token, the moc generator does not generate proper output if it is done
which means that I'm missing something from the big picture

upstream commits:
96611a677f

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-05-07 05:03:30 +00:00
Ivailo Monev
f4c0d67a84 fix build of moc keywords generator
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-05-07 04:01:09 +00:00
Ivailo Monev
bc13cc9556 fix parsing of define in some cases
this change is basicly improved (I believe) version of the upstream change:
96611a677f

It was in no way inspired from it but I note the change as usual

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-05-07 03:58:11 +00:00
Ivailo Monev
a0bca8a769 move bootstrap stuff into moc build file since it's the only thing using it
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-04-27 02:28:26 +00:00
Ivailo Monev
15be073317 support suffixed tools and package them as such
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-04-27 01:57:57 +00:00
Ivailo Monev
41e5ddf421 namespaced build fixes and enabled it by default
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2017-04-26 06:28:30 +00:00
Ivailo Monev
3ce697c027 misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-12-10 01:39:04 +00:00
Ivailo Monev
39f1117c0f various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-11-16 17:03:56 +00:00
Ivailo Monev
0a485e9c3c changes to build moc and core with QT_NO_CAST_FROM_BYTEARRAY
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-11-15 23:38:50 +00:00
Ivailo Monev
d870af2af7 normalizeTypeInternal() cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-11-04 03:15:08 +00:00
Ivailo Monev
d15d92890b mostly 0 to Q_NULLPTR
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-11-04 00:12:26 +00:00
Ivailo Monev
a411f10e76 0 to Q_NULLPTR, incomplete
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-11-03 22:13:13 +00:00
Ivailo Monev
8f1af925b4 installation paths revised
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-10-07 23:43:48 +00:00
Ivailo Monev
4a5bcff7ec embracing the STL
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-10-04 16:33:26 +00:00
Ivailo Monev
6bebf3ae90 Q_CC_MSVC conditionals removal
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-09-11 19:22:13 +00:00
Ivailo Monev
1370130551 build system cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-09-11 03:36:48 +00:00
Ivailo Monev
3131357af2 remove Windows, Mac and other proprietary OS files 2016-09-11 03:34:17 +00:00
Ivailo Monev
210dc17562 assign argc just before it is going to be used in moc
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-29 05:05:32 +00:00
Ivailo Monev
87f1b46415 bootstrap_moc is exe
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-28 14:55:44 +00:00
Ivailo Monev
d346bef8f0 making use of CMake variables for flags
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-28 14:54:57 +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
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
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
227c5a76d9 oops
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-21 03:37:28 +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
c8fec5bc4b make the generators not respecting DESTDIR work again
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-06 17:53:03 +03:00
Ivailo Monev
7e200a18ad add qscript tool
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-08-03 23:35:31 +00:00
Ivailo Monev
9315465b31 attempt to fix build of bootstrap_moc on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 11:08:16 +00:00
Ivailo Monev
9c45079ab3 oops, those should be LDFLAGS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 11:02:22 +00:00
Ivailo Monev
6b5da6f179 attempt to fix build of bootstrap_moc on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 10:55:47 +00:00
Ivailo Monev
6cfde4f823 tools build system cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 10:48:24 +00:00
Ivailo Monev
fb4bdcef9b minor moc cleanup
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-24 04:39:34 +00:00
Ivailo Monev
ebd7f2b1a9 minor moc cleanup
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 08:32:38 +00:00
Ivailo Monev
1986616ebd add manual pages for all tools
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-06 02:31:34 +00:00
Ivailo Monev
46ee66ac32 remove redundant properties setup, also mark GUI apps as such
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-11 17:04:59 +03:00
Ivailo Monev
0afe0c0c36 simplify installation directories handling via use of CPACK_SET_DESTDIR
also, the CMake files are installed where they can be found by default
(without any manual configuration) by default - in the top-level
installation directory (CMAKE_INSTALL_PREFIX)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-10 14:06:44 +03:00
Ivailo Monev
29d0375f1d change the way configuration directories are handled
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-26 02:43:35 +00:00
Ivailo Monev
44649b9eea add manual pages for qdbus and moc tools from Debian
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-07 02:59:36 +02:00
Ivailo Monev
4b4a00f2f8 don't include qconfig.cpp into moc and uic
upstream commits:
ca513feb03

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-20 14:45:53 +02:00
Ivailo Monev
589b732ae1 remove unused property from moc
upstream commits:
9d19be5994

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-20 14:35:35 +02:00
Ivailo Monev
233ecb93c7 define tools specifiec definitions for bootstrapped and shared tools builds
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-19 17:19:03 +02:00
Ivailo Monev
cf157f7d28 remove non-existing methods from moc generator header
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-16 16:15:21 +02:00
Ivailo Monev
9b6e013af2 improve keywords generator build script 2016-01-16 16:04:46 +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