diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-16 10:47:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-16 11:25:35 +0000 |
| commit | a517eb24faa7f62a18722ecef39571b51e82b63d (patch) | |
| tree | 5c73395392fe4f5f38fa408a1c5fab3c8b3b884b /src/tools/uic/uic.cpp | |
| parent | a174b3df4411f5534789d11a1c2aa310095a02f9 (diff) | |
uic: Ignore obsolete pixmap functions
After qtbase/550d2a0a15c9403894448ab83863e71bbac2d349,
pixmap functions are used for icons as well which can cause compile
errors for old UI files that still use them.
Task-number: QTBUG-8563
Change-Id: I61bd4b9c1bf774e071a35c5806657054a77ff4d0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/tools/uic/uic.cpp')
| -rw-r--r-- | src/tools/uic/uic.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index 957a50b1d5..f275aaeb29 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -247,8 +247,12 @@ bool Uic::write(DomUI *ui) } pixFunction = ui->elementPixmapFunction(); - if (pixFunction == QLatin1String("QPixmap::fromMimeSource")) - pixFunction = QLatin1String("qPixmapFromMimeSource"); + if (pixFunction == QLatin1String("QPixmap::fromMimeSource") + || pixFunction == QLatin1String("qPixmapFromMimeSource")) { + fprintf(stderr, "%s: Warning: Obsolete pixmap function '%s' specified in the UI file.\n", + qPrintable(opt.messagePrefix()), qPrintable(pixFunction)); + pixFunction.clear(); + } info.acceptUI(ui); cWidgetsInfo.acceptUI(ui); |