Commit graph

983 commits

Author SHA1 Message Date
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
Ivailo Monev
e3571460fa attempt to fix gui component build on OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:46:18 +00:00
Ivailo Monev
10a2bdaf62 minor QPen header cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:36:49 +00:00
Ivailo Monev
6e4af59a4d QPen is forward declared in qwindowdefs header
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:33:33 +00:00
Ivailo Monev
ac4817393f add required OS X header to GUI_HEADERS
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:08:15 +00:00
Ivailo Monev
eaf4f93c87 fix the location to the OS X resource file for gui component
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 10:07:25 +00:00
Ivailo Monev
941e914fee build system adjustments for OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 10:01:07 +00:00
Ivailo Monev
1f3e17350c remove now unused functions from raster painting engine
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 09:09:32 +00:00
Ivailo Monev
274d06582c move some katie_definition() calls to top-level CMake file
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 03:00:50 +00:00
Ivailo Monev
70dc47bf3b get rid of QCosmeticStroker
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-24 14:54:22 +00:00
Ivailo Monev
e40225f7c8 cleanup the resterizer
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-24 14:29:42 +00:00
Ivailo Monev
ccbd0ce98e now that qthread_p.h is not included from qapplication_p.h - qplatformdefs.h must be
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-23 06:12:02 +03:00
Ivailo Monev
8cfb29ed14 include bundled libpng directory when needed
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-23 06:10:14 +03:00
Ivailo Monev
cb1bad0791 bundle libpng
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-23 05:30:41 +00:00
Ivailo Monev
705fa7c1ab move qthread_p.h inclusion out of qapplication_p.h
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 22:41:28 +00:00
Ivailo Monev
a3bfda06f6 say goodbye to QVariant(Qt::GlobalColor)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 21:46:00 +00:00
Ivailo Monev
0ab08fd159 no more paddings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 21:44:47 +00:00
Ivailo Monev
b1cf754ee5 do not forward-declare QColor just for the sake of debug stream
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 13:57:51 +00:00
Ivailo Monev
b1176f7089 do not use Q_PACKED
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 09:27:36 +00:00
Ivailo Monev
0c5a261b6e various cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-22 04:25:03 +00:00
Ivailo Monev
2059c781c6 Merge branch 'master' of https://github.com/fluxer/katie 2016-07-21 13:51:11 +00:00
Ivailo Monev
12dacc1d9a various cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-21 13:50:52 +00:00
Ivailo Monev
37d5ef7969 fix build after e56e39cf
the function is not a method of QWizardAntiFlickerWidget so there is no way
it can access the private wizardPrivate member, oops

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-19 06:59:43 +03:00
Ivailo Monev
91dd13aa89 get rid of QMimeSource [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-18 07:16:14 +00:00
Ivailo Monev
9c733a3181 get rid of QClipboard and QDropEvent compat
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-18 06:12:29 +00:00
Ivailo Monev
e56e39cfdc fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-18 05:37:14 +00:00
Ivailo Monev
827a60069e update comment about QWidget friend class
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-18 01:44:53 +00:00
Ivailo Monev
efa33d4396 various cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-17 23:58:13 +00:00
Ivailo Monev
093009f3e7 properly implement QAlphaPaintEngine::drawImage()
unlike in the upstream commit I opted to implement it properly since it is
called explicitly (and questionably) from QPSPrintEngine::drawImage()

upstream commits:
14d9a2b06c

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-17 02:18:23 +00:00
Ivailo Monev
45bb7cc6a7 fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-17 02:09:06 +00:00
Ivailo Monev
13c822d3b1 remove redundant conditional for using bundled libpng
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-15 16:09:59 +00:00
Ivailo Monev
3e4e6c4279 removed legacy pixmap and image cleanup hooks
upstream commits:
8aa0be210a

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-15 16:08:45 +00:00
Ivailo Monev
81c6f05fe4 change some QImage methods to take char* to avoid reinterpret_cast
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-15 16:04:36 +00:00
Ivailo Monev
720e8703a3 headers comapt werk
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-14 17:20:38 +00:00
Ivailo Monev
b1df408a44 headers compat werk
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-14 16:24:40 +00:00
Ivailo Monev
d69bcfaf5d remove redudant moc file inclusion
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-12 12:52:25 +00:00
Ivailo Monev
498512c819 setup X11 related definitions from the top-level CMake file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-10 03:03:15 +03:00
Ivailo Monev
9ebc979ae2 make some X11 extensions optional as was in stock Qt4
this makes it possible to build without tricks on Slitaz for an example (or
at least the GUI component, I have yet to test everything) where only the
bare minimum is installed/available

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-10 02:53:30 +03:00
Ivailo Monev
010451e304 fix a pedantic compiler warning
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-05 12:46:27 +00:00
Ivailo Monev
8708f76386 cleanup ClassId enum
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-04 02:05:14 +03:00
Ivailo Monev
9c0729f7d5 Revert "QTessellator is private and used only on platforms that use X11"
This reverts commit e4ed5d7cef.

the opengl component needs it too
2016-07-03 18:23:11 +03:00
Ivailo Monev
31420afe5a there is no need to store the pixmap data pointer in QPixmapData::createCompatiblePixmapData()
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-03 03:03:47 +00:00