Commit graph

1098 commits

Author SHA1 Message Date
Ivailo Monev
79116f99d8 put the Homebrew prefix workaround where it belongs
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 16:02:17 +00:00
Ivailo Monev
c05ec6b751 kerning is required for OS X too
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:59:55 +00:00
Ivailo Monev
7f872f3160 kerning is required for OS X too
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-31 18:47:04 +03:00
Ivailo Monev
b981aae566 another try to fix the OS X build in Travis
it seems that Homebrew installs some packages into /usr/local/opt so by
setting CMAKE_INSTALL_PREFIX to that path find_library() and such should
look there first

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:45:15 +00:00
Ivailo Monev
c145e0de0c OS X build fixes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-31 18:43:22 +03:00
Ivailo Monev
653d996561 try to install libpng, libtiff and jpeg-turbo that match the build architecture for OS X in Travis
I have no idea if this will solve the linking problem tough

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:29:02 +00:00
Ivailo Monev
93148b9a9d fix a compiler warning
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:25:35 +00:00
Ivailo Monev
82b8b067a4 separate the logic for Freetype support from X11
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:25:22 +00:00
Ivailo Monev
1344290740 fix build system conditional
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:04:43 +00:00
Ivailo Monev
c5f428489e remove the traces benchmark
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:03:19 +00:00
Ivailo Monev
f901f5fe6e CUPS support is not disabled for OS X unlike in Qt4
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 14:55:41 +00:00
Ivailo Monev
788d854244 fix build regression
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 14:28:33 +00:00
Ivailo Monev
c97f4ab884 cleanup QGraphicsItem derived classes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 14:24:11 +00:00
Ivailo Monev
8042c6793f do not change the format on QImage transformation and set render hits via one call
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 13:52:27 +00:00
Ivailo Monev
5f012948ce various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 12:40:31 +00:00
Ivailo Monev
c0af1a2337 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-30 20:38:35 +00:00
Ivailo Monev
a81392ee40 remove the unused QVolatileImage and QCoreGraphicsSystem
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-30 19:46:20 +00:00
Ivailo Monev
08e0765d08 remove the unused pixmap factory
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-30 19:00:16 +00:00
Ivailo Monev
4f55d3eb2e remove painting emulation leftovers, follow up on e438721d
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-30 17:30:58 +00:00
Ivailo Monev
ba2200f209 remove Qt3 support methods from designer component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-30 13:36:02 +00:00
Ivailo Monev
b352d5e6c6 soft keys supports is not needed anymore
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-30 13:02:25 +00:00
Ivailo Monev
5bf2222f30 enable Linux tests in Travis again
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 12:19:23 +00:00
Ivailo Monev
b28ce55a43 fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 12:18:18 +00:00
Ivailo Monev
aed373e327 include QScopedLoopLevelCounter header where needed
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 12:00:03 +00:00
Ivailo Monev
db3a47834f include QFontMetrics header where needed
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 11:40:58 +00:00
Ivailo Monev
ca541d5076 fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 11:40:31 +00:00
Ivailo Monev
cedfc63514 fix inclusion of moc files in qmacstyle_mac.mm
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 11:17:58 +00:00
Ivailo Monev
e9f8b098cf fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 11:14:36 +00:00
Ivailo Monev
899bfc2b25 QFontEngineFT is used not only on Q_WS_X11
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 11:02:08 +00:00
Ivailo Monev
d4822000af fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 11:01:34 +00:00
Ivailo Monev
5bacb09b07 fix path to private header in include directive
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 10:28:03 +00:00
Ivailo Monev
ae00be2e60 fix reference to variable from the Fontconfig CMake module
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 10:27:11 +00:00
Ivailo Monev
9069f13ef6 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 03:02:11 +00:00
Ivailo Monev
a1d5f5c776 fix a compiler warning
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 01:02:04 +00:00
Ivailo Monev
da73e0a79a cleanup the OpenGL painting engine
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 00:47:19 +00:00
Ivailo Monev
06d091d4a3 take a shortcut from QImagePixmapCleanupHooks::enableCleanupHooks()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 00:29:10 +00:00
Ivailo Monev
af576381d7 move qfactoryloader_p header inclusion to the source file needing it
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 00:28:25 +00:00
Ivailo Monev
5441ad85bc OS X build fix
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-25 16:12:54 +03:00
Ivailo Monev
42a2a884b3 OS X build fix
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-25 15:54:52 +03:00
Ivailo Monev
62b763b4f4 make it possible to moc .mm files
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-25 15:25:50 +03:00
Ivailo Monev
b557a278e9 OS X build fix
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 14:50:11 +00:00
Ivailo Monev
2e1a52872b QMacMime and QMacPasteboardMime fixup 2016-07-25 14:32:03 +00:00
Ivailo Monev
bdeb42ab6f include qthread_p.h for QScopedLoopLevelCounter from qmacinputcontext_mac.cpp
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:36:18 +00:00
Ivailo Monev
b0bb3c85de add required OS X header to GUI_HEADERS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:19:47 +00:00
Ivailo Monev
952aee2134 create QMacStyle alias header
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:07:38 +00:00
Ivailo Monev
6f68ed32ed add back stubs for the private slots of QPrintDialog
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 12:54:13 +00:00
Ivailo Monev
421387a9e8 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 12:39:03 +00:00
Ivailo Monev
249a006e5c put print dialog classes in order [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 14:41:21 +00:00
Ivailo Monev
d26ed81295 cleanup forward class declarations in QPrintDialog header [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 14:27:55 +00:00
Ivailo Monev
0ccd698880 move QUnixPrintWidget class from the header to the source file
upstream commits:
c8b1f7c859

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 14:03:45 +00:00