diff --git a/CHANGELOG.md b/CHANGELOG.md index 5493f06080c..44281ab4fad 100644 --- a/CHANGELOG.md +++ b/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)) diff --git a/README.md b/README.md index a820fbe0093..d50d5a8bbf4 100644 --- a/README.md +++ b/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: diff --git a/platform/pom.xml b/platform/pom.xml index ac3029d9c93..6cb1d972b9d 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -271,7 +271,7 @@ org.bytedeco qt-platform - 5.13.2-${project.version} + 5.14.0-${project.version} org.bytedeco diff --git a/qt/README.md b/qt/README.md index 1edc4eba16a..32811c7a65b 100644 --- a/qt/README.md +++ b/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++. org.bytedeco qt-platform - 5.13.2-1.5.3-SNAPSHOT + 5.14.0-1.5.3-SNAPSHOT diff --git a/qt/cppbuild.sh b/qt/cppbuild.sh index 36036202368..e35c5c35b96 100755 --- a/qt/cppbuild.sh +++ b/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" diff --git a/qt/platform/pom.xml b/qt/platform/pom.xml index 1561586813a..2a1e7c7bfea 100644 --- a/qt/platform/pom.xml +++ b/qt/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco qt-platform - 5.13.2-${project.parent.version} + 5.14.0-${project.parent.version} JavaCPP Presets Platform for Qt diff --git a/qt/pom.xml b/qt/pom.xml index 4c25c8765c9..b9f7154bba9 100644 --- a/qt/pom.xml +++ b/qt/pom.xml @@ -11,7 +11,7 @@ org.bytedeco qt - 5.13.2-${project.parent.version} + 5.14.0-${project.parent.version} JavaCPP Presets for Qt diff --git a/qt/samples/pom.xml b/qt/samples/pom.xml index 2fec09679bc..1b3230bfeed 100644 --- a/qt/samples/pom.xml +++ b/qt/samples/pom.xml @@ -10,7 +10,7 @@ org.bytedeco qt-platform - 5.13.2-1.5.3-SNAPSHOT + 5.14.0-1.5.3-SNAPSHOT diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java index 578d6b9846f..de14793d3df 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java +++ b/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 } diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java index dd06cd01362..afc3e84a547 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java +++ b/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); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java index e14c37bd169..e26af2507c1 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java +++ b/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(); } diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java index 5e07645f83e..ce49e56e83a 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java +++ b/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); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java index e61e45fba64..ade243a99c7 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java +++ b/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); } diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java index d4de8b0f223..38abacd4ee7 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java +++ b/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); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java index 320a3efc0fa..a84ce34813f 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java +++ b/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); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java index 6c28731f6be..fa8686b260e 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java +++ b/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); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java index 31ed9569fee..81b1ae307a9 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java @@ -19,7 +19,7 @@ public class QVariant extends Pointer { public QVariant() { super((Pointer)null); allocate(); } - private native void allocate(); + @NoException private native void allocate(); public QVariant(int typeId, @Const Pointer copy) { super((Pointer)null); allocate(typeId, copy); } private native void allocate(int typeId, @Const Pointer copy); public QVariant(int typeId, @Const Pointer copy, @Cast("unsigned int") int flags) { super((Pointer)null); allocate(typeId, copy, flags); } @@ -42,9 +42,9 @@ public class QVariant extends Pointer { private native void allocate(float f); // #ifndef QT_NO_CAST_FROM_ASCII public QVariant(@Cast("const char*") BytePointer str) { super((Pointer)null); allocate(str); } - private native @Deprecated void allocate(@Cast("const char*") BytePointer str); + @Deprecated private native void allocate(@Cast("const char*") BytePointer str); public QVariant(String str) { super((Pointer)null); allocate(str); } - private native @Deprecated void allocate(String str); + @Deprecated private native void allocate(String str); // #endif public QVariant(@Const @ByRef QByteArray bytearray) { super((Pointer)null); allocate(bytearray); } @@ -60,15 +60,15 @@ public class QVariant extends Pointer { // #if QT_CONFIG(regularexpression) // #endif // QT_CONFIG(regularexpression) // #ifndef QT_BOOTSTRAPPED +// #if QT_CONFIG(easingcurve) +// #endif // #endif // QT_BOOTSTRAPPED // #if QT_CONFIG(itemmodel) // #endif public native @ByRef @Name("operator =") QVariant put(@Const @ByRef QVariant other); -// #ifdef Q_COMPILER_RVALUE_REFS -// #endif - public native void swap(@ByRef QVariant other); + public native @NoException void swap(@ByRef QVariant other); public native int userType(); public native @Cast("const char*") BytePointer typeName(); @@ -116,6 +116,8 @@ public class QVariant extends Pointer { // #if QT_CONFIG(regularexpression) // #endif // QT_CONFIG(regularexpression) // #ifndef QT_BOOTSTRAPPED +// #if QT_CONFIG(easingcurve) +// #endif // #endif // QT_BOOTSTRAPPED // #if QT_CONFIG(itemmodel) // #endif diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QAbstractTextDocumentLayout.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QAbstractTextDocumentLayout.java new file mode 100644 index 00000000000..c68e1b27382 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QAbstractTextDocumentLayout.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QAbstractTextDocumentLayout extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QAbstractTextDocumentLayout() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QAbstractTextDocumentLayout(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QAbstractUndoItem.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QAbstractUndoItem.java new file mode 100644 index 00000000000..d2e6c0ecab7 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QAbstractUndoItem.java @@ -0,0 +1,23 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + + +@Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QAbstractUndoItem extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QAbstractUndoItem(Pointer p) { super(p); } + + public native void undo(); + public native void redo(); +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java index 001c3a91d2a..897ff7d9af1 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java @@ -116,6 +116,7 @@ public class QFont extends Pointer { /** enum QFont::ResolveProperties */ public static final int + NoPropertiesResolved = 0x0000, FamilyResolved = 0x0001, SizeResolved = 0x0002, StyleHintResolved = 0x0004, @@ -135,6 +136,7 @@ public class QFont extends Pointer { StyleNameResolved = 0x10000, FamiliesResolved = 0x20000, AllPropertiesResolved = 0x3ffff; + public QFont() { super((Pointer)null); allocate(); } private native void allocate(); @@ -228,8 +230,6 @@ public class QFont extends Pointer { public native @Cast("bool") @Name("operator <") boolean lessThan(@Const @ByRef QFont arg0); public native @ByVal @Name("operator QVariant") QVariant asQVariant(); public native @Cast("bool") boolean isCopyOf(@Const @ByRef QFont arg0); -// #ifdef Q_COMPILER_RVALUE_REFS -// #endif // #if QT_DEPRECATED_SINCE(5, 3) // needed for X11 diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java index 74f8b2d82ac..5484fc5e93d 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java @@ -71,6 +71,9 @@ public class QGuiApplication extends QCoreApplication { public static native @Cast("Qt::ApplicationState") int applicationState(); + public static native void setHighDpiScaleFactorRoundingPolicy(@Cast("Qt::HighDpiScaleFactorRoundingPolicy") int policy); + public static native @Cast("Qt::HighDpiScaleFactorRoundingPolicy") int highDpiScaleFactorRoundingPolicy(); + public static native int exec(); public native @Cast("bool") @Name("notify") boolean _notify(QObject arg0, QEvent arg1); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java index 09608e89392..e972bb2e55b 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java @@ -31,17 +31,13 @@ public class QIcon extends Pointer { public static final int On = 0, Off = 1; public QIcon() { super((Pointer)null); allocate(); } - private native void allocate(); + @NoException private native void allocate(); public QIcon(@Const @ByRef QIcon other) { super((Pointer)null); allocate(other); } private native void allocate(@Const @ByRef QIcon other); -// #ifdef Q_COMPILER_RVALUE_REFS -// #endif public QIcon(@Const @ByRef QString fileName) { super((Pointer)null); allocate(fileName); } private native void allocate(@Const @ByRef QString fileName); // file or resource name public native @ByRef @Name("operator =") QIcon put(@Const @ByRef QIcon other); -// #ifdef Q_COMPILER_RVALUE_REFS -// #endif - public native void swap(@ByRef QIcon other); + public native @NoException void swap(@ByRef QIcon other); public native @ByVal @Name("operator QVariant") QVariant asQVariant(); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextBlock.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextBlock.java new file mode 100644 index 00000000000..620844c5342 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextBlock.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextBlock extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextBlock() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextBlock(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextCodec.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextCodec.java new file mode 100644 index 00000000000..1fe972dd795 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextCodec.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextCodec extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextCodec() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextCodec(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextDocumentPrivate.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextDocumentPrivate.java new file mode 100644 index 00000000000..71e97d6dd3e --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextDocumentPrivate.java @@ -0,0 +1,21 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextDocumentPrivate extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextDocumentPrivate() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextDocumentPrivate(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFormat.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFormat.java new file mode 100644 index 00000000000..18001aa9e44 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFormat.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextFormat extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextFormat() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextFormat(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFormatCollection.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFormatCollection.java new file mode 100644 index 00000000000..740cb7dd4e2 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFormatCollection.java @@ -0,0 +1,21 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextFormatCollection extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextFormatCollection() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextFormatCollection(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFrame.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFrame.java new file mode 100644 index 00000000000..bbba047eda7 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextFrame.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextFrame extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextFrame() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextFrame(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextListFormat.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextListFormat.java new file mode 100644 index 00000000000..921c4aa14f0 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextListFormat.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextListFormat extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextListFormat() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextListFormat(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextObject.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextObject.java new file mode 100644 index 00000000000..2ce8243377e --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextObject.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextObject extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextObject() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextObject(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextOption.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextOption.java new file mode 100644 index 00000000000..c66cc6c3157 --- /dev/null +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QTextOption.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.qt.Qt5Gui; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import org.bytedeco.qt.Qt5Core.*; +import static org.bytedeco.qt.global.Qt5Core.*; + +import static org.bytedeco.qt.global.Qt5Gui.*; + +@Opaque @Properties(inherit = org.bytedeco.qt.presets.Qt5Gui.class) +public class QTextOption extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QTextOption() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QTextOption(Pointer p) { super(p); } +} diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java index 2fe9f531a27..d22bb3d12f5 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java @@ -78,7 +78,7 @@ public class QAction extends QObject { public native void setSeparator(@Cast("bool") boolean b); public native @Cast("bool") boolean isSeparator(); -// #ifndef QT_NO_SHORTCUT +// #if QT_CONFIG(shortcut) public native void setShortcutContext(@Cast("Qt::ShortcutContext") int context); public native @Cast("Qt::ShortcutContext") int shortcutContext(); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java index fd7a9b5ae17..9aca0f02a1a 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java @@ -117,9 +117,11 @@ public class QLineEdit extends QWidget { public native @Cast("bool") boolean hasAcceptableInput(); public native void setTextMargins(int left, int top, int right, int bottom); +// #if QT_DEPRECATED_SINCE(5, 14) public native void getTextMargins(IntPointer left, IntPointer top, IntPointer right, IntPointer bottom); public native void getTextMargins(IntBuffer left, IntBuffer top, IntBuffer right, IntBuffer bottom); public native void getTextMargins(int[] left, int[] top, int[] right, int[] bottom); +// #endif public native void setText(@Const @ByRef QString arg0); public native void clear(); public native void selectAll(); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java index e4fb598945c..0dd33dcd733 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java @@ -72,48 +72,48 @@ public enum ControlType { public QSizePolicy() { super((Pointer)null); allocate(); } -private native void allocate(); +@NoException private native void allocate(); // #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC) // #else public QSizePolicy(@Cast("QSizePolicy::Policy") int horizontal, @Cast("QSizePolicy::Policy") int vertical, ControlType type/*=QSizePolicy::DefaultType*/) { super((Pointer)null); allocate(horizontal, vertical, type); } - private native void allocate(@Cast("QSizePolicy::Policy") int horizontal, @Cast("QSizePolicy::Policy") int vertical, ControlType type/*=QSizePolicy::DefaultType*/); + @NoException private native void allocate(@Cast("QSizePolicy::Policy") int horizontal, @Cast("QSizePolicy::Policy") int vertical, ControlType type/*=QSizePolicy::DefaultType*/); public QSizePolicy(@Cast("QSizePolicy::Policy") int horizontal, @Cast("QSizePolicy::Policy") int vertical) { super((Pointer)null); allocate(horizontal, vertical); } - private native void allocate(@Cast("QSizePolicy::Policy") int horizontal, @Cast("QSizePolicy::Policy") int vertical); + @NoException private native void allocate(@Cast("QSizePolicy::Policy") int horizontal, @Cast("QSizePolicy::Policy") int vertical); // #endif // uniform-init - public native @Cast("QSizePolicy::Policy") int horizontalPolicy(); - public native @Cast("QSizePolicy::Policy") int verticalPolicy(); - public native ControlType controlType(); + public native @NoException @Cast("QSizePolicy::Policy") int horizontalPolicy(); + public native @NoException @Cast("QSizePolicy::Policy") int verticalPolicy(); + public native @NoException ControlType controlType(); - public native void setHorizontalPolicy(@Cast("QSizePolicy::Policy") int d); - public native void setVerticalPolicy(@Cast("QSizePolicy::Policy") int d); - public native void setControlType(ControlType type); + public native @NoException void setHorizontalPolicy(@Cast("QSizePolicy::Policy") int d); + public native @NoException void setVerticalPolicy(@Cast("QSizePolicy::Policy") int d); + public native @NoException void setControlType(ControlType type); - public native void setHeightForWidth(@Cast("bool") boolean b); - public native @Cast("bool") boolean hasHeightForWidth(); - public native void setWidthForHeight(@Cast("bool") boolean b); - public native @Cast("bool") boolean hasWidthForHeight(); + public native @NoException void setHeightForWidth(@Cast("bool") boolean b); + public native @Cast("bool") @NoException boolean hasHeightForWidth(); + public native @NoException void setWidthForHeight(@Cast("bool") boolean b); + public native @Cast("bool") @NoException boolean hasWidthForHeight(); - public native @Cast("bool") @Name("operator ==") boolean equals(@Const @ByRef QSizePolicy s); - public native @Cast("bool") @Name("operator !=") boolean notEquals(@Const @ByRef QSizePolicy s); + public native @Cast("bool") @Name("operator ==") @NoException boolean equals(@Const @ByRef QSizePolicy s); + public native @Cast("bool") @Name("operator !=") @NoException boolean notEquals(@Const @ByRef QSizePolicy s); public native @ByVal @Name("operator QVariant") QVariant asQVariant(); - public native int horizontalStretch(); - public native int verticalStretch(); + public native @NoException int horizontalStretch(); + public native @NoException int verticalStretch(); public native void setHorizontalStretch(int stretchFactor); public native void setVerticalStretch(int stretchFactor); - public native @Cast("bool") boolean retainSizeWhenHidden(); - public native void setRetainSizeWhenHidden(@Cast("bool") boolean retainSize); + public native @Cast("bool") @NoException boolean retainSizeWhenHidden(); + public native @NoException void setRetainSizeWhenHidden(@Cast("bool") boolean retainSize); - public native void transpose(); + public native @NoException void transpose(); // #ifndef Q_QDOC // #endif - public native @ByVal QSizePolicy transposed(); + public native @ByVal @NoException QSizePolicy transposed(); } diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java index 9f87a2ab964..27c421cf423 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java @@ -736,6 +736,13 @@ public class QStyle extends QObject { SP_MediaVolume = 68, SP_MediaVolumeMuted = 69, SP_LineEditClearButton = 70, + SP_DialogYesToAllButton = 71, + SP_DialogNoToAllButton = 72, + SP_DialogSaveAllButton = 73, + SP_DialogAbortButton = 74, + SP_DialogRetryButton = 75, + SP_DialogIgnoreButton = 76, + SP_RestoreDefaultsButton = 77, // do not add any values below/greater than this SP_CustomBase = 0xf0000000; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java index 5261a87563e..93732f76303 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java @@ -101,6 +101,10 @@ public enum AutoFormattingFlag { // #ifndef QT_NO_TEXTHTMLPARSER public native @ByVal QString toHtml(); // #endif +// #if QT_CONFIG(textmarkdownwriter) + public native @ByVal QString toMarkdown(@Cast("QTextDocument::MarkdownFeatures") int features/*=QTextDocument::MarkdownDialectGitHub*/); + public native @ByVal QString toMarkdown(); +// #endif public native void ensureCursorVisible(); // #ifndef QT_NO_CONTEXTMENU @@ -155,6 +159,9 @@ public static class ExtraSelection extends Pointer { public native void setPlainText(@Const @ByRef QString text); // #ifndef QT_NO_TEXTHTMLPARSER public native void setHtml(@Const @ByRef QString text); +// #endif +// #if QT_CONFIG(textmarkdownreader) + public native void setMarkdown(@Const @ByRef QString markdown); // #endif public native void setText(@Const @ByRef QString text); diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java index 088ae492d18..8932cd5b5a0 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java @@ -266,9 +266,11 @@ public class QWidget extends QObject { public native void setContentsMargins(int left, int top, int right, int bottom); +// #if QT_DEPRECATED_SINCE(5, 14) public native void getContentsMargins(IntPointer left, IntPointer top, IntPointer right, IntPointer bottom); public native void getContentsMargins(IntBuffer left, IntBuffer top, IntBuffer right, IntBuffer bottom); public native void getContentsMargins(int[] left, int[] top, int[] right, int[] bottom); +// #endif public native QLayout layout(); public native void setLayout(QLayout arg0); public native void updateGeometry(); diff --git a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java index d3a6bde21b4..6ab243826f0 100644 --- a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java +++ b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java @@ -196,6 +196,13 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata AscendingOrder = 0, DescendingOrder = 1; + /** enum Qt::SplitBehaviorFlags */ + public static final int + KeepEmptyParts = 0, + SkipEmptyParts = 0x1; +// #define Q_DECLARE_FLAGS(arg0, arg1)(SplitBehavior, SplitBehaviorFlags) + + /** enum Qt::TileRule */ public static final int StretchTile = 0, @@ -358,14 +365,18 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata WA_MouseTracking = 2, WA_ContentsPropagated = 3, // ## deprecated WA_OpaquePaintEvent = 4, - WA_NoBackground = WA_OpaquePaintEvent, // ## deprecated +// #if QT_DEPRECATED_SINCE(5, 14) + WA_NoBackground = WA_OpaquePaintEvent, +// #endif WA_StaticContents = 5, WA_LaidOut = 7, WA_PaintOnScreen = 8, WA_NoSystemBackground = 9, WA_UpdatesDisabled = 10, WA_Mapped = 11, - WA_MacNoClickThrough = 12, // Mac only +// #if QT_DEPRECATED_SINCE(5, 14) + WA_MacNoClickThrough = 12, +// #endif WA_InputMethodEnabled = 14, WA_WState_Visible = 15, WA_WState_Hidden = 16, @@ -383,8 +394,10 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata WA_Moved = 43, WA_PendingUpdate = 44, WA_InvalidSize = 45, - WA_MacBrushedMetal = 46, // Mac only - WA_MacMetalStyle = WA_MacBrushedMetal, // obsolete +// #if QT_DEPRECATED_SINCE(5, 14) + WA_MacBrushedMetal = 46, + WA_MacMetalStyle = 46, +// #endif WA_CustomWhatsThis = 47, WA_LayoutOnEntireRect = 48, WA_OutsideWSRange = 49, @@ -441,7 +454,9 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata WA_LayoutUsesWidgetRect = 92, WA_StyledBackground = 93, // internal - WA_MSWindowsUseDirect3D = 94, // Win only +// #if QT_DEPRECATED_SINCE(5, 14) + WA_MSWindowsUseDirect3D = 94, +// #endif WA_CanHostQMdiSubWindowTitleBar = 95, // Internal WA_MacAlwaysShowToolWindow = 96, // Mac only @@ -473,9 +488,9 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata WA_X11NetWmWindowTypeNotification = 114, WA_X11NetWmWindowTypeCombo = 115, WA_X11NetWmWindowTypeDND = 116, - - WA_MacFrameworkScaled = 117, - +// #if QT_DEPRECATED_SINCE(5, 14) + WA_MacFrameworkScaled = 117, +// #endif WA_SetWindowModality = 118, WA_WState_WindowOpacitySet = 119, // internal WA_TranslucentBackground = 120, @@ -500,7 +515,9 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata @Namespace("Qt") public enum ApplicationAttribute { AA_ImmediateWidgetCreation(0), - AA_MSWindowsUseDirect3DByDefault(1), // Win only +// #if QT_DEPRECATED_SINCE(5, 14) + AA_MSWindowsUseDirect3DByDefault(1), +// #endif AA_DontShowIconsInMenus(2), AA_NativeWindows(3), AA_DontCreateNativeWidgetSiblings(4), @@ -510,7 +527,9 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata AA_DontUseNativeMenuBar(6), AA_MacDontSwapCtrlAndMeta(7), AA_Use96Dpi(8), +// #if QT_DEPRECATED_SINCE(5, 14) AA_X11InitThreads(10), +// #endif AA_SynthesizeTouchForUnhandledMouseEvents(11), AA_SynthesizeMouseForUnhandledTouchEvents(12), AA_UseHighDpiPixmaps(13), @@ -531,9 +550,10 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata AA_DontShowShortcutsInContextMenus(28), AA_CompressTabletEvents(29), AA_DisableWindowContextHelpButton(30), // ### Qt 6: remove me + AA_DisableSessionManager(31), // Add new attributes before this line - AA_AttributeCount(31); + AA_AttributeCount(32); public final int value; private ApplicationAttribute(int v) { this.value = v; } @@ -1207,7 +1227,8 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata public static final int PlainText = 0, RichText = 1, - AutoText = 2; + AutoText = 2, + MarkdownText = 3; /** enum Qt::AspectRatioMode */ public static final int @@ -1394,7 +1415,9 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata public static final int ImEnabled = 0x1, ImCursorRectangle = 0x2, - ImMicroFocus = 0x2, // deprecated +// #if QT_DEPRECATED_SINCE(5, 14) + ImMicroFocus = 0x2, +// #endif ImFont = 0x4, ImCursorPosition = 0x8, ImSurroundingText = 0x10, @@ -1637,7 +1660,7 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata BottomLeftSection = 8, TitleBarArea = 9; // For move -// #if defined(Q_COMPILER_CLASS_ENUM) && defined(Q_COMPILER_CONSTEXPR) +// #if defined(Q_COMPILER_CONSTEXPR) // #else /** enum Qt::Initialization */ public static final int @@ -1751,6 +1774,15 @@ public enum QtMsgType { QtDebugMsg(0), QtWarningMsg(1), QtCriticalMsg(2), QtFata ChecksumIso3309 = 0, ChecksumItuV41 = 1; + /** enum class Qt::HighDpiScaleFactorRoundingPolicy */ + public static final int + Unset = 0, + Round = 1, + Ceil = 2, + Floor = 3, + RoundPreferFloor = 4, + PassThrough = 5; + // #ifndef Q_QDOC // #endif // Q_DOC diff --git a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java index 0d3d7a4aca5..cfcf9aff7bb 100644 --- a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java +++ b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java @@ -19,6 +19,107 @@ public class Qt5Gui extends org.bytedeco.qt.helper.Qt5Gui { +// Parsed from QtGui/qtextdocument.h + +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// #ifndef QTEXTDOCUMENT_H +// #define QTEXTDOCUMENT_H + +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// Targeting ../Qt5Gui/QTextFormatCollection.java + + +// Targeting ../Qt5Gui/QTextListFormat.java + + +// Targeting ../Qt5Gui/QAbstractTextDocumentLayout.java + + +// Targeting ../Qt5Gui/QTextObject.java + + +// Targeting ../Qt5Gui/QTextFormat.java + + +// Targeting ../Qt5Gui/QTextFrame.java + + +// Targeting ../Qt5Gui/QTextBlock.java + + +// Targeting ../Qt5Gui/QTextCodec.java + + +// Targeting ../Qt5Gui/QTextOption.java + + + @Namespace("Qt") public static native @Cast("bool") boolean mightBeRichText(@Const @ByRef QString arg0); + @Namespace("Qt") public static native @ByVal QString convertFromPlainText(@Const @ByRef QString plain, @Cast("Qt::WhiteSpaceMode") int mode/*=Qt::WhiteSpacePre*/); + @Namespace("Qt") public static native @ByVal QString convertFromPlainText(@Const @ByRef QString plain); + +// #if QT_CONFIG(textcodec) || defined(Q_CLANG_QDOC) + @Namespace("Qt") public static native QTextCodec codecForHtml(@Const @ByRef QByteArray ba); +// #endif + +// Targeting ../Qt5Gui/QAbstractUndoItem.java + + + + +// Targeting ../Qt5Gui/QTextDocumentPrivate.java + + + + + +// #endif // QTEXTDOCUMENT_H + + + // Targeting ../Qt5Gui/QFont.java diff --git a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java index 8690ad30c1f..50918d2de0e 100644 --- a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java +++ b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java @@ -31,7 +31,7 @@ public class Qt5Core extends org.bytedeco.qt.presets.Qt5Core { static { // // Load macOS framework -// File framework = new File("/usr/local/Cellar/qt/5.13.0/lib/QtCore.framework/QtCore"); +// File framework = new File("/usr/local/Cellar/qt/5.14.0/lib/QtCore.framework/QtCore"); // if (framework.exists()) { // System.load(framework.getAbsolutePath()); // } diff --git a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java index 6d8c9c01768..d9df71ea83e 100644 --- a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java +++ b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java @@ -29,7 +29,7 @@ public class Qt5Gui extends org.bytedeco.qt.presets.Qt5Gui { // static { -// File framework = new File("/usr/local/Cellar/qt/5.13.0/lib/QtGui.framework/QtGui"); +// File framework = new File("/usr/local/Cellar/qt/5.14.0/lib/QtGui.framework/QtGui"); // if (framework.exists()) { // System.load(framework.getAbsolutePath()); // } diff --git a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java index 0f9030a4f31..d6379007780 100644 --- a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java +++ b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java @@ -40,7 +40,7 @@ public class Qt5Widgets extends org.bytedeco.qt.presets.Qt5Widgets { // static { -// File framework = new File("/usr/local/Cellar/qt/5.13.0/lib/QtWidgets.framework/QtWidgets"); +// File framework = new File("/usr/local/Cellar/qt/5.14.0/lib/QtWidgets.framework/QtWidgets"); // if (framework.exists()) { // System.load(framework.getAbsolutePath()); // } diff --git a/qt/src/main/java/org/bytedeco/qt/presets/Qt5Core.java b/qt/src/main/java/org/bytedeco/qt/presets/Qt5Core.java index 44cc56010dc..af5ac59131e 100644 --- a/qt/src/main/java/org/bytedeco/qt/presets/Qt5Core.java +++ b/qt/src/main/java/org/bytedeco/qt/presets/Qt5Core.java @@ -65,7 +65,7 @@ public void map(InfoMap infoMap) { super.map(infoMap); infoMap .put(new Info("Q_CORE_EXPORT", "Q_INVOKABLE").cppTypes().annotations()) - .put(new Info("QT_ASCII_CAST_WARN", "QT_DEPRECATED").cppTypes().annotations("@Deprecated")) + .put(new Info("QT_ASCII_CAST_WARN", "QT_DEPRECATED", "QT_DEPRECATED_VERSION_5_14").cppTypes().annotations("@Deprecated")) // Helper classes .put(new Info("QString").base("AbstractQString")) @@ -117,6 +117,7 @@ protected String[] defineFalse() { // qnamespace.h "defined(Q_COMPILER_CLASS_ENUM) && defined(Q_COMPILER_CONSTEXPR)", + "defined(Q_COMPILER_CONSTEXPR)", "Q_MOC_RUN", // QObject @@ -217,6 +218,7 @@ protected Map macros() { macros.put("quint64", "unsigned long long"); macros.put("qlonglong", "long long"); macros.put("qulonglong", "unsigned long long"); + macros.put("qintptr", "long int"); macros.put("uchar", "unsigned char"); macros.put("ushort", "unsigned short"); macros.put("uint", "unsigned int"); @@ -227,6 +229,7 @@ protected Map macros() { macros.put("Q_ALWAYS_INLINE", "inline"); macros.put("Q_DECL_COLD_FUNCTION", ""); macros.put("Q_DECL_CONSTEXPR", ""); + macros.put("Q_DECL_ENUMERATOR_DEPRECATED", ""); macros.put("Q_DECL_DEPRECATED", ""); macros.put("Q_DECL_NOEXCEPT", ""); macros.put("Q_DECL_NOTHROW", ""); diff --git a/qt/src/main/java/org/bytedeco/qt/presets/Qt5Gui.java b/qt/src/main/java/org/bytedeco/qt/presets/Qt5Gui.java index 7209a1bf1d5..bede1ae7cea 100644 --- a/qt/src/main/java/org/bytedeco/qt/presets/Qt5Gui.java +++ b/qt/src/main/java/org/bytedeco/qt/presets/Qt5Gui.java @@ -38,6 +38,7 @@ @Platform( include = { "qevent.h", + "qtextdocument.h", "QFont", "QIcon", "QGuiApplication" diff --git a/qt/src/main/java/org/bytedeco/qt/presets/Qt5Widgets.java b/qt/src/main/java/org/bytedeco/qt/presets/Qt5Widgets.java index 118dd944ba2..a4340ba0786 100644 --- a/qt/src/main/java/org/bytedeco/qt/presets/Qt5Widgets.java +++ b/qt/src/main/java/org/bytedeco/qt/presets/Qt5Widgets.java @@ -145,7 +145,8 @@ protected Map flags() { @Override protected String[] intEnums() { return new String[]{ - "QMessageBox::StandardButton" + "QMessageBox::StandardButton", + "QTextDocument::MarkdownFeatures" }; }