diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
| commit | ee71a9ba8169b9327b8dbaf2266ebeb515c64dbb (patch) | |
| tree | a2eb41c9b1b47ac8cd6f22c289f7227569ee0a5a /src/gui | |
| parent | d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 (diff) | |
| parent | 98f19f00361bf25097281cae5dfa833ba7db8a2f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/network/ssl/qsslsocket.cpp
src/widgets/kernel/qapplication.cpp
Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 1 | ||||
| -rw-r--r-- | src/gui/doc/src/qtgui.qdoc | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglextrafunctions.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 7f4d7cc6af..4de159d97a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -373,6 +373,7 @@ }, "headers": "jpeglib.h", "sources": [ + { "type": "pkgConfig", "args": "libjpeg" }, { "libs": "-llibjpeg", "condition": "config.msvc" }, "-ljpeg" ] diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc index c4e7d32de1..392b6040cb 100644 --- a/src/gui/doc/src/qtgui.qdoc +++ b/src/gui/doc/src/qtgui.qdoc @@ -62,7 +62,7 @@ \include module-use.qdocinc using qt module \quotefile overview/using-qt-gui.cmake - See also the \l[QtDoc]{Building with CMake} overview. + See also the \l[QtDoc]{Build with CMake} overview. \section2 Building with qmake diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 74e0e6401e..c4c7de1b2e 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1344,7 +1344,7 @@ Qt::WindowStates QWindow::windowStates() const This is a hint to the window manager that this window is a dialog or pop-up on behalf of the transient parent. - In order to cause the window to be centered above its transient parent by + In order to cause the window to be centered above its transient \a parent by default, depending on the window manager, it may also be necessary to call setFlags() with a suitable \l Qt::WindowType (such as \c Qt::Dialog). diff --git a/src/gui/opengl/qopenglextrafunctions.h b/src/gui/opengl/qopenglextrafunctions.h index a68e269065..faac2dce4e 100644 --- a/src/gui/opengl/qopenglextrafunctions.h +++ b/src/gui/opengl/qopenglextrafunctions.h @@ -54,7 +54,7 @@ // GLES build without having included gl32.h -> GLDEBUGPROC is still need for the protos, define it here #if defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_ES_3_2) -typedef void (QOPENGLF_APIENTRYP *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); +typedef void (QOPENGLF_APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); #endif QT_BEGIN_NAMESPACE |