diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 20:56:32 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 20:56:32 +0200 |
commit | 7ff96330ed28b957a80d294a43748c8051c0e483 (patch) | |
tree | 435ad1eebe666d8e8eee21cd888d183899b7ef4f /src/gui/painting | |
parent | d3d078aa4ba2aeebb0998e75cd9d5b980db7fbfe (diff) |
get QtWidgets to link
some more changes, mainly exporting methods from
QtGui to get QtWidgets to link.
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qcssutil_p.h | 4 | ||||
-rw-r--r-- | src/gui/painting/qmemrotate.cpp | 12 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine_raster_p.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qprinter.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qprinter_p.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qprinterinfo_unix.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/painting/qcssutil_p.h b/src/gui/painting/qcssutil_p.h index 80606b4cb9..ab1abc99cf 100644 --- a/src/gui/painting/qcssutil_p.h +++ b/src/gui/painting/qcssutil_p.h @@ -71,10 +71,10 @@ extern void qDrawRoundedCorners(QPainter *p, qreal x1, qreal y1, qreal x2, qreal const QSizeF& r1, const QSizeF& r2, QCss::Edge edge, QCss::BorderStyle s, QBrush c); -extern void qDrawBorder(QPainter *p, const QRect &rect, const QCss::BorderStyle *styles, +extern void Q_GUI_EXPORT qDrawBorder(QPainter *p, const QRect &rect, const QCss::BorderStyle *styles, const int *borders, const QBrush *colors, const QSize *radii); -extern void qNormalizeRadii(const QRect &br, const QSize *radii, +extern void Q_GUI_EXPORT qNormalizeRadii(const QRect &br, const QSize *radii, QSize *tlr, QSize *trr, QSize *blr, QSize *brr); QT_END_NAMESPACE diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index fe524aff3b..c7002e2162 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -512,34 +512,34 @@ inline void qt_memrotate90_template<quint18, quint32>(const quint32 *src, } #define QT_IMPL_MEMROTATE(srctype, desttype) \ -void qt_memrotate90(const srctype *src, int w, int h, int sstride, \ +Q_GUI_EXPORT void qt_memrotate90(const srctype *src, int w, int h, int sstride, \ desttype *dest, int dstride) \ { \ qt_memrotate90_template(src, w, h, sstride, dest, dstride); \ } \ -void qt_memrotate180(const srctype *src, int w, int h, int sstride, \ +Q_GUI_EXPORT void qt_memrotate180(const srctype *src, int w, int h, int sstride, \ desttype *dest, int dstride) \ { \ qt_memrotate180_template(src, w, h, sstride, dest, dstride); \ } \ -void qt_memrotate270(const srctype *src, int w, int h, int sstride, \ +Q_GUI_EXPORT void qt_memrotate270(const srctype *src, int w, int h, int sstride, \ desttype *dest, int dstride) \ { \ qt_memrotate270_template(src, w, h, sstride, dest, dstride); \ } #define QT_IMPL_SIMPLE_MEMROTATE(srctype, desttype) \ -void qt_memrotate90(const srctype *src, int w, int h, int sstride, \ +Q_GUI_EXPORT void qt_memrotate90(const srctype *src, int w, int h, int sstride, \ desttype *dest, int dstride) \ { \ qt_memrotate90_tiled_unpacked<desttype,srctype>(src, w, h, sstride, dest, dstride); \ } \ -void qt_memrotate180(const srctype *src, int w, int h, int sstride, \ +Q_GUI_EXPORT void qt_memrotate180(const srctype *src, int w, int h, int sstride, \ desttype *dest, int dstride) \ { \ qt_memrotate180_template(src, w, h, sstride, dest, dstride); \ } \ -void qt_memrotate270(const srctype *src, int w, int h, int sstride, \ +Q_GUI_EXPORT void qt_memrotate270(const srctype *src, int w, int h, int sstride, \ desttype *dest, int dstride) \ { \ qt_memrotate270_tiled_unpacked<desttype,srctype>(src, w, h, sstride, dest, dstride); \ diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 0cffabea23..78f5d5b791 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -128,7 +128,7 @@ public: /******************************************************************************* * QRasterPaintEngine */ -class QRasterPaintEngine : public QPaintEngineEx +class Q_GUI_EXPORT QRasterPaintEngine : public QPaintEngineEx { Q_DECLARE_PRIVATE(QRasterPaintEngine) public: diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index e5e254fa68..4a0b8d1d66 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -114,7 +114,7 @@ static const float qt_paperSizes[][2] = { }; /// return the multiplier of converting from the unit value to postscript-points. -double qt_multiplierForUnit(QPrinter::Unit unit, int resolution) +Q_GUI_EXPORT double qt_multiplierForUnit(QPrinter::Unit unit, int resolution) { switch(unit) { case QPrinter::Millimeter: @@ -136,7 +136,7 @@ double qt_multiplierForUnit(QPrinter::Unit unit, int resolution) } // not static: it's needed in qpagesetupdialog_unix.cpp -QSizeF qt_printerPaperSize(QPrinter::Orientation orientation, +Q_GUI_EXPORT QSizeF qt_printerPaperSize(QPrinter::Orientation orientation, QPrinter::PaperSize paperSize, QPrinter::Unit unit, int resolution) diff --git a/src/gui/painting/qprinter_p.h b/src/gui/painting/qprinter_p.h index f112b882e9..c6e325f38f 100644 --- a/src/gui/painting/qprinter_p.h +++ b/src/gui/painting/qprinter_p.h @@ -70,7 +70,7 @@ class QPrintEngine; class QPreviewPaintEngine; class QPicture; -class QPrinterPrivate +class Q_GUI_EXPORT QPrinterPrivate { Q_DECLARE_PUBLIC(QPrinter) public: diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp index e81f4ad743..488299bd44 100644 --- a/src/gui/painting/qprinterinfo_unix.cpp +++ b/src/gui/painting/qprinterinfo_unix.cpp @@ -741,7 +741,7 @@ void qt_parseQconfig(QList<QPrinterDescription> *printers) } while (!ts.atEnd()); } -int qt_getLprPrinters(QList<QPrinterDescription>& printers) +Q_GUI_EXPORT int qt_getLprPrinters(QList<QPrinterDescription>& printers) { QByteArray etcLpDefault; qt_parsePrintcap(&printers, QLatin1String("/etc/printcap")); |