diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 4 | ||||
| -rw-r--r-- | src/tools/uic/qclass_lib_map.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 3531e762fa..bcb96841df 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1425,8 +1425,8 @@ bool updateAndroidManifest(Options &options) options.packageName = reader.attributes().value(QLatin1String("package")).toString(); } else if (reader.name() == QLatin1String("uses-sdk")) { if (reader.attributes().hasAttribute(QLatin1String("android:minSdkVersion"))) - if (reader.attributes().value(QLatin1String("android:minSdkVersion")).toInt() < 21) { - fprintf(stderr, "Invalid minSdkVersion version, minSdkVersion must be >= 21\n"); + if (reader.attributes().value(QLatin1String("android:minSdkVersion")).toInt() < 23) { + fprintf(stderr, "Invalid minSdkVersion version, minSdkVersion must be >= 23\n"); return false; } } else if ((reader.name() == QLatin1String("application") || diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 5793b3ad13..df7ea27e20 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -560,6 +560,7 @@ QT_CLASS_LIB(QFontDialog, QtWidgets, qfontdialog.h) QT_CLASS_LIB(QInputDialog, QtWidgets, qinputdialog.h) QT_CLASS_LIB(QMessageBox, QtWidgets, qmessagebox.h) QT_CLASS_LIB(QPageSetupDialog, QtWidgets, qpagesetupdialog.h) +QT_CLASS_LIB(QOpenGLWidget, QtOpenGLWidgets, qopenglwidget.h) QT_CLASS_LIB(QPrintDialog, QtPrintSupport, qprintdialog.h) QT_CLASS_LIB(QPrintPreviewDialog, QtPrintSupport, qprintpreviewdialog.h) QT_CLASS_LIB(QProgressDialog, QtWidgets, qprogressdialog.h) |