OSDN Git Service
Ivailo Monev [Sun, 31 Jul 2016 15:59:55 +0000 (15:59 +0000)]
kerning is required for OS X too
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 15:45:15 +0000 (15:45 +0000)]
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>
Ivailo Monev [Sun, 31 Jul 2016 15:29:02 +0000 (15:29 +0000)]
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>
Ivailo Monev [Sun, 31 Jul 2016 15:25:35 +0000 (15:25 +0000)]
fix a compiler warning
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 15:25:22 +0000 (15:25 +0000)]
separate the logic for Freetype support from X11
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 15:04:43 +0000 (15:04 +0000)]
fix build system conditional
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 15:03:19 +0000 (15:03 +0000)]
remove the traces benchmark
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 14:55:41 +0000 (14:55 +0000)]
CUPS support is not disabled for OS X unlike in Qt4
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 14:28:33 +0000 (14:28 +0000)]
fix build regression
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 14:24:11 +0000 (14:24 +0000)]
cleanup QGraphicsItem derived classes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 13:52:27 +0000 (13:52 +0000)]
do not change the format on QImage transformation and set render hits via one call
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 31 Jul 2016 03:00:58 +0000 (03:00 +0000)]
various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 30 Jul 2016 20:38:35 +0000 (20:38 +0000)]
various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 30 Jul 2016 19:46:20 +0000 (19:46 +0000)]
remove the unused QVolatileImage and QCoreGraphicsSystem
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 30 Jul 2016 19:00:16 +0000 (19:00 +0000)]
remove the unused pixmap factory
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 30 Jul 2016 17:30:58 +0000 (17:30 +0000)]
remove painting emulation leftovers, follow up on
e438721d
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 30 Jul 2016 13:36:02 +0000 (13:36 +0000)]
remove Qt3 support methods from designer component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 30 Jul 2016 13:02:25 +0000 (13:02 +0000)]
soft keys supports is not needed anymore
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 12:19:23 +0000 (12:19 +0000)]
enable Linux tests in Travis again
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 12:18:18 +0000 (12:18 +0000)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 12:00:03 +0000 (12:00 +0000)]
include QScopedLoopLevelCounter header where needed
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 11:40:58 +0000 (11:40 +0000)]
include QFontMetrics header where needed
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 11:40:31 +0000 (11:40 +0000)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 11:17:58 +0000 (11:17 +0000)]
fix inclusion of moc files in qmacstyle_mac.mm
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 11:14:36 +0000 (11:14 +0000)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 11:02:08 +0000 (11:02 +0000)]
QFontEngineFT is used not only on Q_WS_X11
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 11:01:34 +0000 (11:01 +0000)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 10:28:03 +0000 (10:28 +0000)]
fix path to private header in include directive
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 10:27:11 +0000 (10:27 +0000)]
fix reference to variable from the Fontconfig CMake module
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 03:02:11 +0000 (03:02 +0000)]
various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 01:02:04 +0000 (01:02 +0000)]
fix a compiler warning
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 00:47:19 +0000 (00:47 +0000)]
cleanup the OpenGL painting engine
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 00:29:10 +0000 (00:29 +0000)]
take a shortcut from QImagePixmapCleanupHooks::enableCleanupHooks()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 26 Jul 2016 00:28:25 +0000 (00:28 +0000)]
move qfactoryloader_p header inclusion to the source file needing it
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:12:54 +0000 (16:12 +0300)]
OS X build fix
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jul 2016 12:54:52 +0000 (15:54 +0300)]
OS X build fix
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jul 2016 12:25:50 +0000 (15:25 +0300)]
make it possible to moc .mm files
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jul 2016 14:50:11 +0000 (14:50 +0000)]
OS X build fix
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 14:32:03 +0000 (14:32 +0000)]
QMacMime and QMacPasteboardMime fixup
Ivailo Monev [Mon, 25 Jul 2016 13:36:18 +0000 (13:36 +0000)]
include qthread_p.h for QScopedLoopLevelCounter from qmacinputcontext_mac.cpp
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:19:47 +0000 (13:19 +0000)]
add required OS X header to GUI_HEADERS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:07:38 +0000 (13:07 +0000)]
create QMacStyle alias header
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 12:54:13 +0000 (12:54 +0000)]
add back stubs for the private slots of QPrintDialog
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 12:39:03 +0000 (12:39 +0000)]
various cleanups
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 14:41:04 +0000 (14:41 +0000)]
put print dialog classes in order [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 14:27:55 +0000 (14:27 +0000)]
cleanup forward class declarations in QPrintDialog header [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 14:03:45 +0000 (14:03 +0000)]
move QUnixPrintWidget class from the header to the source file
upstream commits:
https://github.com/qt/qtbase/commit/
c8b1f7c8597e4764ada1ab067890fdfebbbbcc9b
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:46:18 +0000 (13:46 +0000)]
attempt to fix gui component build on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:36:49 +0000 (13:36 +0000)]
minor QPen header cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:33:33 +0000 (13:33 +0000)]
QPen is forward declared in qwindowdefs header
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:18:03 +0000 (13:18 +0000)]
add required OS X header to CORE_HEADERS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:08:15 +0000 (13:08 +0000)]
add required OS X header to GUI_HEADERS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 13:07:34 +0000 (13:07 +0000)]
do not run build verbose in Travis
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 12:56:25 +0000 (12:56 +0000)]
fix core component build on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 12:35:42 +0000 (12:35 +0000)]
apply the C++ flags as C flags, with filter
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 11:59:16 +0000 (11:59 +0000)]
just disable iconv support on OS X for now
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 11:35:31 +0000 (11:35 +0000)]
qcore_mac adjustment to QString changes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 11:25:59 +0000 (11:25 +0000)]
separate UNIX and KATIE_PlATFORM checks in bootstrap
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 11:18:11 +0000 (11:18 +0000)]
qcore_mac seems to be requires by bootstrap
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 11:08:16 +0000 (11:08 +0000)]
attempt to fix build of bootstrap_moc on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 11:02:22 +0000 (11:02 +0000)]
oops, those should be LDFLAGS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:55:47 +0000 (10:55 +0000)]
attempt to fix build of bootstrap_moc on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:48:24 +0000 (10:48 +0000)]
tools build system cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:36:15 +0000 (10:36 +0000)]
make building verbose on OS X in Travis
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:25:08 +0000 (10:25 +0000)]
attempt to fix the OS X build
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:13:59 +0000 (10:13 +0000)]
attempt to fix the OS X build
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:07:25 +0000 (10:07 +0000)]
fix the location to the OS X resource file for gui component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 10:01:07 +0000 (10:01 +0000)]
build system adjustments for OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 09:52:09 +0000 (09:52 +0000)]
experimental mac mkspec file and disabling test on linux for now (in Travis)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 09:34:46 +0000 (09:34 +0000)]
let's try OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 09:21:54 +0000 (09:21 +0000)]
minor JavaScriptCore/script component cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 09:09:32 +0000 (09:09 +0000)]
remove now unused functions from raster painting engine
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 07:49:38 +0000 (07:49 +0000)]
adjust QFileInfoPrivate constructors to new data order
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 07:44:52 +0000 (07:44 +0000)]
just do not use mmap() for loading translations and resources
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 07:15:34 +0000 (07:15 +0000)]
minor data structure optimizations
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 05:41:03 +0000 (05:41 +0000)]
remove redundant const_cast() form QPointer operators
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 05:40:02 +0000 (05:40 +0000)]
remove the hacks for having QxmlStream in core and xml
upstream commits:
https://github.com/qt/qtbase/commit/
33fe499d47adf1ab450f0855d0b639f028d60140
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 03:00:50 +0000 (03:00 +0000)]
move some katie_definition() calls to top-level CMake file
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 01:46:07 +0000 (01:46 +0000)]
add QT_OPENGL_ES_1/QT_OPENGL_ES_2 to KATIE_DEFINITIONS when needed
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 01:26:31 +0000 (01:26 +0000)]
remove redundant QGraphicsShaderEffect
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 01:21:35 +0000 (01:21 +0000)]
minor QGLWindowSurfacePrivate structure optimization
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 25 Jul 2016 01:19:32 +0000 (01:19 +0000)]
remove redundant QGLTexturePool
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 14:54:22 +0000 (14:54 +0000)]
get rid of QCosmeticStroker
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 14:29:42 +0000 (14:29 +0000)]
cleanup the resterizer
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 09:26:33 +0000 (09:26 +0000)]
QDBusServiceWatcherPrivate cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 09:03:48 +0000 (09:03 +0000)]
just generate some heat from QUuid::createUuid()
it is simply faster
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 09:02:07 +0000 (09:02 +0000)]
oops, fix the config paths
the second backslash was for CMake
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 08:00:57 +0000 (08:00 +0000)]
QThreadStorageData cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 24 Jul 2016 06:51:18 +0000 (06:51 +0000)]
QSharedPointer cleanup
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 24 Jul 2016 06:05:57 +0000 (06:05 +0000)]
cleanup configuration directories handling
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 24 Jul 2016 04:39:34 +0000 (04:39 +0000)]
minor moc cleanup
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 24 Jul 2016 03:17:31 +0000 (03:17 +0000)]
the QString benchmark works when the compiler is GCC too
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 22:51:37 +0000 (22:51 +0000)]
make the Arch package depend on icu
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Merge branch 'master' of https://github.com/fluxer/katie
Ivailo Monev [Sat, 23 Jul 2016 22:49:45 +0000 (22:49 +0000)]
various cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 22:49:32 +0000 (22:49 +0000)]
make ICU support non-runtime
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 22:46:34 +0000 (22:46 +0000)]
make the ICU CMake module check for icuuc library too
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 05:30:41 +0000 (05:30 +0000)]
bundle libpng
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 03:12:02 +0000 (06:12 +0300)]
now that qthread_p.h is not included from qapplication_p.h - qplatformdefs.h must be
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 23 Jul 2016 03:10:14 +0000 (06:10 +0300)]
include bundled libpng directory when needed
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
OSDN Git Service
