* Upgrade presets for Qt 5.14.0

CHANGELOG.md

@@ -4,7 +4,7 @@
  * Add `opencv_python3` module and corresponding loader class with sample code to the presets for OpenCV
  * Bundle OpenSSL in the presets for CPython for consistency across platforms ([issue #796](https://github.com/bytedeco/javacpp-presets/issues/796))
  * Add presets for Arrow 0.15.1, SciPy 1.3.2 ([issue #747](https://github.com/bytedeco/javacpp-presets/issues/747))
- * Upgrade presets for NumPy 1.17.4, CUDA 10.2, cuDNN 7.6.5, NCCL 2.5.6, ALE 0.6.1, ONNX Runtime 1.0.0, Qt 5.13.2, Skia 1.68.1
+ * Upgrade presets for NumPy 1.17.4, CUDA 10.2, cuDNN 7.6.5, NCCL 2.5.6, ALE 0.6.1, ONNX Runtime 1.0.0, Qt 5.14.0, Skia 1.68.1
 
 ### November 5, 2019 version 1.5.2
  * Add presets for the `cudacodec`, `cudafeatures2d`, `cudastereo`, and `cudabgsegm` modules of OpenCV ([issue #806](https://github.com/bytedeco/javacpp-presets/issues/806))

README.md

@@ -148,7 +148,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
  * ONNX Runtime 1.0.0 https://github.com/microsoft/onnxruntime
  * LiquidFun http://google.github.io/liquidfun/
- * Qt 5.13.x https://download.qt.io/archive/qt/
+ * Qt 5.14.x https://download.qt.io/archive/qt/
  * Mono/Skia 1.68.x https://github.com/mono/skia
  * cpu_features 0.4.1 https://github.com/google/cpu_features
  * System APIs of the build environments:

platform/pom.xml

@@ -271,7 +271,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>qt-platform</artifactId>
- <version>5.13.2-${project.version}</version>
+ <version>5.14.0-${project.version}</version>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>

qt/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Qt 5.13.2 https://www.qt.io/
+ * Qt 5.14.0 https://www.qt.io/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -46,7 +46,7 @@ Please see the samples directory for more Qt examples ported to Java from C++.
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>qt-platform</artifactId>
- <version>5.13.2-1.5.3-SNAPSHOT</version>
+ <version>5.14.0-1.5.3-SNAPSHOT</version>
  </dependency>
  </dependencies>
  <build>

qt/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
  exit
 fi
 
-QT_VERSION=5.13.2
+QT_VERSION=5.14.0
 download https://download.qt.io/archive/qt/${QT_VERSION%.*}/$QT_VERSION/single/qt-everywhere-src-$QT_VERSION.tar.xz qt-$QT_VERSION.tar.xz
 
 mkdir -p "$PLATFORM$EXTENSION"

qt/platform/pom.xml

@@ -12,7 +12,7 @@
 
  <groupId>org.bytedeco</groupId>
  <artifactId>qt-platform</artifactId>
- <version>5.13.2-${project.parent.version}</version>
+ <version>5.14.0-${project.parent.version}</version>
  <name>JavaCPP Presets Platform for Qt</name>
 
  <properties>

qt/pom.xml

@@ -11,7 +11,7 @@
 
  <groupId>org.bytedeco</groupId>
  <artifactId>qt</artifactId>
- <version>5.13.2-${project.parent.version}</version>
+ <version>5.14.0-${project.parent.version}</version>
  <name>JavaCPP Presets for Qt</name>
 
  <dependencies>

qt/samples/pom.xml

@@ -10,7 +10,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>qt-platform</artifactId>
- <version>5.13.2-1.5.3-SNAPSHOT</version>
+ <version>5.14.0-1.5.3-SNAPSHOT</version>
  </dependency>
  </dependencies>
  <build>

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java

@@ -51,5 +51,7 @@ public class QAbstractEventDispatcher extends QObject {
 
  public native void startingUp();
  public native void closingDown();
+// #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
  public native @Cast("bool") boolean filterNativeEvent(@Const @ByRef QByteArray eventType, Pointer message, CLongPointer result);
+// #else
 }

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java

@@ -38,7 +38,7 @@ public enum Base64Option {
 // #define Q_DECLARE_FLAGS(arg0, arg1)(Base64Options, Base64Option)
 
  public QByteArray() { super((Pointer)null); allocate(); }
- private native void allocate();
+ @NoException private native void allocate();
  public QByteArray(@Cast("const char*") BytePointer arg0, int size/*=-1*/) { super((Pointer)null); allocate(arg0, size); }
  private native void allocate(@Cast("const char*") BytePointer arg0, int size/*=-1*/);
  public QByteArray(@Cast("const char*") BytePointer arg0) { super((Pointer)null); allocate(arg0); }
@@ -52,15 +52,13 @@ public enum Base64Option {
  public QByteArray(int size, @Cast("Qt::Initialization") int arg1) { super((Pointer)null); allocate(size, arg1); }
  private native void allocate(int size, @Cast("Qt::Initialization") int arg1);
  public QByteArray(@Const @ByRef QByteArray arg0) { super((Pointer)null); allocate(arg0); }
- private native void allocate(@Const @ByRef QByteArray arg0);
+ @NoException private native void allocate(@Const @ByRef QByteArray arg0);
 
- public native @ByRef @Name("operator =") QByteArray put(@Const @ByRef QByteArray arg0);
+ public native @ByRef @Name("operator =") @NoException QByteArray put(@Const @ByRef QByteArray arg0);
  public native @ByRef @Name("operator =") QByteArray put(@Cast("const char*") BytePointer str);
  public native @ByRef @Name("operator =") QByteArray put(String str);
-// #ifdef Q_COMPILER_RVALUE_REFS
-// #endif
 
- public native void swap(@ByRef QByteArray other);
+ public native @NoException void swap(@ByRef QByteArray other);
 
  public native int size();
  public native @Cast("bool") boolean isEmpty();
@@ -86,6 +84,8 @@ public enum Base64Option {
 
  public native @Cast("char") byte at(int i);
  public native @Cast("char") @Name("operator []") byte get(int i);
+
+
  public native @Cast("char") byte front();
 
  public native @Cast("char") byte back();
@@ -154,9 +154,9 @@ public enum Base64Option {
  public native @ByVal QByteArray simplified();
 // #endif
 
- public native @ByVal QByteArray leftJustified(int width, @Cast("char") byte fill/*=' '*/, @Cast("bool") boolean truncate/*=false*/);
+ public native @ByVal QByteArray leftJustified(int width, @Cast("char") byte _fill/*=' '*/, @Cast("bool") boolean truncate/*=false*/);
 public native @ByVal QByteArray leftJustified(int width);
- public native @ByVal QByteArray rightJustified(int width, @Cast("char") byte fill/*=' '*/, @Cast("bool") boolean truncate/*=false*/);
+ public native @ByVal QByteArray rightJustified(int width, @Cast("char") byte _fill/*=' '*/, @Cast("bool") boolean truncate/*=false*/);
 public native @ByVal QByteArray rightJustified(int width);
 
  public native @ByRef QByteArray prepend(@Cast("char") byte c);

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java

@@ -277,6 +277,6 @@ public enum Type {
  public native void accept();
  public native void ignore();
 
- public static native int registerEventType(int hint/*=-1*/);
- public static native int registerEventType();
+ public static native @NoException int registerEventType(int hint/*=-1*/);
+ public static native @NoException int registerEventType();
 }

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java

@@ -22,13 +22,11 @@ public class QMessageLogContext extends Pointer {
  }
 
  public QMessageLogContext() { super((Pointer)null); allocate(); }
-private native void allocate();
+@NoException private native void allocate();
  public QMessageLogContext(@Cast("const char*") BytePointer fileName, int lineNumber, @Cast("const char*") BytePointer functionName, @Cast("const char*") BytePointer categoryName) { super((Pointer)null); allocate(fileName, lineNumber, functionName, categoryName); }
-private native void allocate(@Cast("const char*") BytePointer fileName, int lineNumber, @Cast("const char*") BytePointer functionName, @Cast("const char*") BytePointer categoryName);
+@NoException private native void allocate(@Cast("const char*") BytePointer fileName, int lineNumber, @Cast("const char*") BytePointer functionName, @Cast("const char*") BytePointer categoryName);
 public QMessageLogContext(String fileName, int lineNumber, String functionName, String categoryName) { super((Pointer)null); allocate(fileName, lineNumber, functionName, categoryName); }
-private native void allocate(String fileName, int lineNumber, String functionName, String categoryName);
-
- public native void copy(@Const @ByRef QMessageLogContext logContext);
+@NoException private native void allocate(String fileName, int lineNumber, String functionName, String categoryName);
 
  public native int version(); public native QMessageLogContext version(int setter);
  public native int line(); public native QMessageLogContext line(int setter);

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java

@@ -43,6 +43,6 @@ public class QMessageLogger extends Pointer {
 
  public native void critical(@Cast("const char*") BytePointer msg);
  public native void critical(String msg);
- public native void fatal(@Cast("const char*") BytePointer msg);
- public native void fatal(String msg);
+ public native @NoException void fatal(@Cast("const char*") BytePointer msg);
+ public native @NoException void fatal(String msg);
 }

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java

@@ -45,8 +45,8 @@ public class QObject extends Pointer {
  public native @Cast("bool") boolean isWidgetType();
  public native @Cast("bool") boolean isWindowType();
 
- public native @Cast("bool") boolean signalsBlocked();
- public native @Cast("bool") boolean blockSignals(@Cast("bool") boolean b);
+ public native @Cast("bool") @NoException boolean signalsBlocked();
+ public native @Cast("bool") @NoException boolean blockSignals(@Cast("bool") boolean b);
 
  public native int startTimer(int interval, @Cast("Qt::TimerType") int timerType/*=Qt::CoarseTimer*/);
  public native int startTimer(int interval);
@@ -100,7 +100,7 @@ public class QObject extends Pointer {
 // #endif // QT_NO_PROPERTIES
 
 // #ifndef QT_NO_USERDATA
- public static native @Cast("unsigned int") int registerUserData();
+ public static native @Cast("unsigned int") @Deprecated int registerUserData();
  public native QObject parent();
 
  public native @Cast("bool") boolean inherits(@Cast("const char*") BytePointer classname);

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java

@@ -23,35 +23,38 @@ public class QSize extends Pointer {
  }
 
  public QSize() { super((Pointer)null); allocate(); }
-private native void allocate();
+@NoException private native void allocate();
  public QSize(int w, int h) { super((Pointer)null); allocate(w, h); }
-private native void allocate(int w, int h);
+@NoException private native void allocate(int w, int h);
 
- public native @Cast("bool") boolean isNull();
- public native @Cast("bool") boolean isEmpty();
- public native @Cast("bool") boolean isValid();
+ public native @Cast("bool") @NoException boolean isNull();
+ public native @Cast("bool") @NoException boolean isEmpty();
+ public native @Cast("bool") @NoException boolean isValid();
 
- public native int width();
- public native int height();
- public native void setWidth(int w);
- public native void setHeight(int h);
- public native void transpose();
- public native @ByVal QSize transposed();
+ public native @NoException int width();
+ public native @NoException int height();
+ public native @NoException void setWidth(int w);
+ public native @NoException void setHeight(int h);
+ public native @NoException void transpose();
+ public native @ByVal @NoException QSize transposed();
 
- public native void scale(int w, int h, @Cast("Qt::AspectRatioMode") int mode);
- public native void scale(@Const @ByRef QSize s, @Cast("Qt::AspectRatioMode") int mode);
- public native @ByVal QSize scaled(int w, int h, @Cast("Qt::AspectRatioMode") int mode);
- public native @ByVal QSize scaled(@Const @ByRef QSize s, @Cast("Qt::AspectRatioMode") int mode);
+ public native @NoException void scale(int w, int h, @Cast("Qt::AspectRatioMode") int mode);
+ public native @NoException void scale(@Const @ByRef QSize s, @Cast("Qt::AspectRatioMode") int mode);
+ public native @ByVal @NoException QSize scaled(int w, int h, @Cast("Qt::AspectRatioMode") int mode);
+ public native @ByVal @NoException QSize scaled(@Const @ByRef QSize s, @Cast("Qt::AspectRatioMode") int mode);
 
- public native @ByVal QSize expandedTo(@Const @ByRef QSize arg0);
- public native @ByVal QSize boundedTo(@Const @ByRef QSize arg0);
+ public native @ByVal @NoException QSize expandedTo(@Const @ByRef QSize arg0);
+ public native @ByVal @NoException QSize boundedTo(@Const @ByRef QSize arg0);
 
- public native @ByRef IntPointer rwidth();
- public native @ByRef IntPointer rheight();
+
+
 
- public native @ByRef @Name("operator +=") QSize addPut(@Const @ByRef QSize arg0);
- public native @ByRef @Name("operator -=") QSize subtractPut(@Const @ByRef QSize arg0);
- public native @ByRef @Name("operator *=") QSize multiplyPut(double c);
+ public native @ByRef @NoException IntPointer rwidth();
+ public native @ByRef @NoException IntPointer rheight();
+
+ public native @ByRef @Name("operator +=") @NoException QSize addPut(@Const @ByRef QSize arg0);
+ public native @ByRef @Name("operator -=") @NoException QSize subtractPut(@Const @ByRef QSize arg0);
+ public native @ByRef @Name("operator *=") @NoException QSize multiplyPut(double c);
  public native @ByRef @Name("operator /=") QSize dividePut(double c);
 
 

qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java

@@ -24,13 +24,11 @@ public class QString extends AbstractQString {
 
 
  public QString() { super((Pointer)null); allocate(); }
- private native void allocate();
+ @NoException private native void allocate();
  public QString(@Const @ByRef QString arg0) { super((Pointer)null); allocate(arg0); }
- private native void allocate(@Const @ByRef QString arg0);
- public native @ByRef @Name("operator =") QString put(@Const @ByRef QString arg0);
-// #ifdef Q_COMPILER_RVALUE_REFS
-// #endif
- public native void swap(@ByRef QString other);
+ @NoException private native void allocate(@Const @ByRef QString arg0);
+ public native @ByRef @Name("operator =") @NoException QString put(@Const @ByRef QString arg0);
+ public native @NoException void swap(@ByRef QString other);
  public native int size();
  public native int count();
  public native int length();
@@ -47,6 +45,8 @@ public class QString extends AbstractQString {
  public native @Cast("bool") boolean isDetached();
  public native @Cast("bool") boolean isSharedWith(@Const @ByRef QString other);
  public native void clear();
+
+
 
 
 
@@ -69,6 +69,7 @@ public class QString extends AbstractQString {
 // #endif
 
 
+// #if QT_STRINGVIEW_LEVEL < 2
  public native @ByVal QString arg(@Const @ByRef QString a1, @Const @ByRef QString a2);
  public native @ByVal QString arg(@Const @ByRef QString a1, @Const @ByRef QString a2, @Const @ByRef QString a3);
  public native @ByVal QString arg(@Const @ByRef QString a1, @Const @ByRef QString a2, @Const @ByRef QString a3,
@@ -87,20 +88,31 @@ public class QString extends AbstractQString {
  @Const @ByRef QString a4, @Const @ByRef QString a5, @Const @ByRef QString a6,
  @Const @ByRef QString a7, @Const @ByRef QString a8, @Const @ByRef QString a9);
 
+// #if QT_DEPRECATED_SINCE(5, 14)
  public native @ByRef QString vsprintf(@Cast("const char*") BytePointer format, @ByVal @Cast("va_list*") Pointer ap);
  public native @ByRef QString vsprintf(String format, @ByVal @Cast("va_list*") Pointer ap);
  public native @ByRef QString sprintf(@Cast("const char*") BytePointer format);
  public native @ByRef QString sprintf(String format);
+// #endif
  public static native @ByVal QString vasprintf(@Cast("const char*") BytePointer format, @ByVal @Cast("va_list*") Pointer ap);
  public static native @ByVal QString vasprintf(String format, @ByVal @Cast("va_list*") Pointer ap);
  public static native @ByVal QString asprintf(@Cast("const char*") BytePointer format);
  public static native @ByVal QString asprintf(String format);
+// #if QT_STRINGVIEW_LEVEL < 2
  public native int indexOf(@Const @ByRef QString s, int from/*=0*/, CaseSensitivity cs/*=Qt::CaseSensitive*/);
  public native int indexOf(@Const @ByRef QString s);
+// #endif
+ // ### Qt6: qsizetype
+// #if QT_STRINGVIEW_LEVEL < 2
  public native int lastIndexOf(@Const @ByRef QString s, int from/*=-1*/, CaseSensitivity cs/*=Qt::CaseSensitive*/);
  public native int lastIndexOf(@Const @ByRef QString s);
+// #endif
+
+ // ### Qt6: qsizetype
+// #if QT_STRINGVIEW_LEVEL < 2
  public native @Cast("bool") boolean contains(@Const @ByRef QString s, CaseSensitivity cs/*=Qt::CaseSensitive*/);
  public native @Cast("bool") boolean contains(@Const @ByRef QString s);
+// #endif
  public native int count(@Const @ByRef QString s, CaseSensitivity cs/*=Qt::CaseSensitive*/);
  public native int count(@Const @ByRef QString s);
 
@@ -131,8 +143,8 @@ public enum SectionFlag {
 // #endif
  public native @ByVal QString left(int n);
  public native @ByVal QString right(int n);
- public native @ByVal QString mid(int position, int n/*=-1*/);
-public native @ByVal QString mid(int position);
+ public native @ByVal QString mid(int _position, int n/*=-1*/);
+public native @ByVal QString mid(int _position);
  public native @ByVal QString chopped(int n);
 
 
@@ -198,7 +210,21 @@ public enum SectionFlag {
 // #if QT_CONFIG(regularexpression)
 
 
+
+
+
+
+
+// #ifndef QT_NO_REGEXP
+
+
+// #endif
+// #ifndef QT_NO_REGULAREXPRESSION
+
+
 // #endif
+
+
  /** enum QString::NormalizationForm */
  public static final int
  NormalizationForm_D = 0,
@@ -265,13 +291,13 @@ public enum SectionFlag {
  public native @ByRef QString setUtf16(@Cast("const unsigned short*") short[] utf16, int size);
 
 // #if QT_STRINGVIEW_LEVEL < 2
- public native int compare(@Const @ByRef QString s, CaseSensitivity cs/*=Qt::CaseSensitive*/);
- public native int compare(@Const @ByRef QString s);
+ public native @NoException int compare(@Const @ByRef QString s, CaseSensitivity cs/*=Qt::CaseSensitive*/);
+ public native @NoException int compare(@Const @ByRef QString s);
 // #endif
 
- public static native int compare(@Const @ByRef QString s1, @Const @ByRef QString s2,
+ public static native @NoException int compare(@Const @ByRef QString s1, @Const @ByRef QString s2,
  CaseSensitivity cs/*=Qt::CaseSensitive*/);
- public static native int compare(@Const @ByRef QString s1, @Const @ByRef QString s2);
+ public static native @NoException int compare(@Const @ByRef QString s1, @Const @ByRef QString s2);
 
  public native int localeAwareCompare(@Const @ByRef QString s);
  public static native int localeAwareCompare(@Const @ByRef QString s1, @Const @ByRef QString s2);