diff options
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 64 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 2 | ||||
| -rw-r--r-- | src/gui/image/qimage.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/styles/styles.pri | 2 |
6 files changed, 75 insertions, 9 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index fcefe1381b..aba5be61dd 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -3053,6 +3053,8 @@ \snippet code/doc_src_qmake-manual.pro 159 + This function was introduced in Qt 5.0. + See also \l{clean_path(path)}{clean_path()}, \l{relative_path(filePath[, base])}{relative_path()}. @@ -3087,6 +3089,8 @@ redundant ones removed, and "."s and ".."s resolved (as far as possible). This function is a wrapper around QDir::cleanPath. + This function was introduced in Qt 5.0. + See also \l{absolute_path(path[, base])}{absolute_path()}, \l{relative_path(filePath[, base])}{relative_path()}, \l{shell_path(path)}{shell_path()}, \l{system_path(path)}{system_path()}. @@ -3101,6 +3105,8 @@ Returns a list of all defined variable names. + This function was introduced in Qt 5.0. + \section2 escape_expand(arg1 [, arg2 ..., argn]) Accepts an arbitrary number of arguments. It expands the @@ -3164,6 +3170,8 @@ \snippet code/doc_src_qmake-manual.pro 163 + This function was introduced in Qt 5.0. + \section2 fromfile(filename, variablename) Evaluates \c filename as a qmake project file and returns the value assigned @@ -3178,6 +3186,8 @@ The \c getenv function, however, supports environment variables with parentheses in their name. + This function was introduced in Qt 5.12. + \section2 join(variablename, glue, before, after) Joins the value of \c variablename with \c glue. If this value is @@ -3267,6 +3277,8 @@ sum = $$num_add($$first, $$second_neg) \endcode + This function was introduced in Qt 5.8. + \section2 prompt(question [, decorate]) Displays the specified \c question, and returns a value read from stdin. @@ -3295,6 +3307,8 @@ \note This function is available only on Windows hosts. + This function was introduced in Qt 5.12.1. + \section2 relative_path(filePath[, base]) Returns the path to \c filePath relative to \c base. @@ -3307,6 +3321,8 @@ directory; in that case, this function effectively acts as $$clean_path(). + This function was introduced in Qt 5.0. + See also \l{absolute_path(path[, base])}{absolute_path()}, \l{clean_path(path)}{clean_path()}. @@ -3326,10 +3342,14 @@ This is an internal function that you will typically not need. + This function was introduced in Qt 5.0. + \section2 reverse(variablename) Returns the values of \c variablename in reverse order. + This function was introduced in Qt 5.0. + \section2 section(variablename, separator, begin, end) Returns a section of the value of \c variablename. This function is a @@ -3345,6 +3365,8 @@ This function returns \c path for in-source builds. It returns an empty string if \c path points outside of the source tree. + This function was introduced in Qt 5.0. + \section2 shell_path(path) Converts all directory separators within \c path to separators that are @@ -3352,12 +3374,16 @@ the shell that is invoked by the make tool). For example, slashes are converted to backslashes when the Windows shell is used. + This function was introduced in Qt 5.0. + See also \l{system_path(path)}{system_path()}. \section2 shell_quote(arg) Quotes \c arg for the shell that is used while building the project. + This function was introduced in Qt 5.0. + See also \l{system_quote(arg)}{system_quote()}. \target fn_size @@ -3371,6 +3397,8 @@ This is an internal function that you will typically not need. + This function was introduced in Qt 5.0. + \section2 sorted(variablename) Returns the list of values in \c variablename with entries sorted @@ -3379,6 +3407,8 @@ Numerical sorting can be accomplished by zero-padding the values to a fixed length with the help of the \l{format_number()} function. + This function was introduced in Qt 5.8. + \section2 split(variablename, separator) Splits the value of \c variablename into separate values, and returns them @@ -3425,6 +3455,8 @@ See also \l{member()}, \l{num_add()}. + This function was introduced in Qt 5.8. + \target str_size() \section2 str_size(arg) @@ -3432,6 +3464,8 @@ See also \l{fn_size}{size()}. + This function was introduced in Qt 5.8. + \target system_replace \section2 system(command[, mode[, stsvar]]) @@ -3460,6 +3494,8 @@ invoke commands. For example, slashes are converted to backslashes for the Windows shell. + This function was introduced in Qt 5.0. + See also \l{shell_path(path)}{shell_path()}. \section2 system_quote(arg) @@ -3467,6 +3503,8 @@ Quotes \c arg for the shell that is used by the \c{system()} functions. + This function was introduced in Qt 5.0. + See also \l{shell_quote(arg)}{shell_quote()}. \target take_first() @@ -3477,6 +3515,8 @@ This provides convenience for implementing queues, for example. + This function was introduced in Qt 5.8. + See also \l{take_last()}, \l{fn_first}{first()}. \target take_last() @@ -3487,6 +3527,8 @@ This provides convenience for implementing stacks, for example. + This function was introduced in Qt 5.8. + See also \l{take_first()}, \l{fn_last}{last()}. \target unique @@ -3507,6 +3549,8 @@ Escapes the values of \c variablename in a way that enables parsing them as qmake code. + + This function was introduced in Qt 5.0. */ /*! @@ -3530,6 +3574,8 @@ This is an internal function that you will typically not need. + This function was introduced in Qt 5.0. + \section2 CONFIG(config) This function can be used to test for variables placed into the @@ -3736,6 +3782,8 @@ Prints a message on the console. Unlike the \c message function, neither prepends text nor appends a line break. + This function was introduced in Qt 5.0. + See also \l{message(string)}{message()}. \section2 message(string) @@ -3761,6 +3809,8 @@ Creates the directory path \c dirPath. This function is a wrapper around the QDir::mkpath function. + This function was introduced in Qt 5.0. + \section2 requires(condition) Evaluates \c condition. If the condition is false, qmake skips this @@ -3787,6 +3837,8 @@ Updates the time stamp of \c filename to match the time stamp of \c reference_filename. + This function was introduced in Qt 5.0. + \section2 unset(variablename) Removes \c variablename from the current context. @@ -3803,12 +3855,16 @@ the string will be ignored. Comparison is performed segment-wise from left to right; if one version is a prefix of the other, it is considered smaller. + This function was introduced in Qt 5.10. + \section2 versionAtMost(variablename, versionNumber) Tests that the version number from \c variablename is less than or equal to \c versionNumber. Works as \l{versionAtLeast(variablename, versionNumber)}{versionAtLeast()}. + This function was introduced in Qt 5.10. + \section2 warning(string) Always succeeds, and displays \c string as a warning message to the user. @@ -3820,6 +3876,8 @@ an empty file. If \c mode is \c append and the file already exists, appends to it instead of replacing it. + This function was introduced in Qt 5.0. + \section1 Test Function Library Complex test functions are implemented in a library of .prf files. @@ -3866,6 +3924,8 @@ \snippet code/doc_src_qmake-manual.pro 178 + This function was introduced in Qt 5.0. + \section2 qtCompileTest(test) Builds a test project. If the test passes, true is returned and @@ -3906,10 +3966,14 @@ See also \l{load(feature)}{load()}. + This function was introduced in Qt 5.0. + \section2 qtHaveModule(name) Checks whether the Qt module specified by \c name is present. For a list of possible values, see \l{Variables#QT}{QT}. + + This function was introduced in Qt 5.0.1. */ /*! diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index b2d81066db..5bab897d43 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -805,11 +805,11 @@ QByteArray QFileSystemEngine::id(const QFileSystemEntry &entry) } //static -QByteArray QFileSystemEngine::id(int id) +QByteArray QFileSystemEngine::id(int fd) { QT_STATBUF statResult; - if (QT_FSTAT(id, &statResult)) { - qErrnoWarning("fstat() failed for fd %d", id); + if (QT_FSTAT(fd, &statResult)) { + qErrnoWarning("fstat() failed for fd %d", fd); return QByteArray(); } QByteArray result = QByteArray::number(quint64(statResult.st_dev), 16); diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index ad6cba04dd..4c3c1fc01f 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtCore/qatomic.h> +#include <QtCore/qglobal.h> #ifndef QBASICATOMIC_H #define QBASICATOMIC_H diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b49674644a..c85a51e082 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1331,7 +1331,7 @@ QRect QImage::rect() const The image depth is the number of bits used to store a single pixel, also called bits per pixel (bpp). - The supported depths are 1, 8, 16, 24 and 32. + The supported depths are 1, 8, 16, 24, 32 and 64. \sa bitPlaneCount(), convertToFormat(), {QImage#Image Formats}{Image Formats}, {QImage#Image Information}{Image Information} @@ -1574,7 +1574,9 @@ void QImage::setColor(int i, QRgb c) Returns a pointer to the pixel data at the scanline with index \a i. The first scanline is at index 0. - The scanline data is aligned on a 32-bit boundary. + The scanline data is as minimum 32-bit aligned. For 64-bit formats + it follows the native alignment of 64-bit integers (64-bit for most + platforms, but notably 32-bit on i386). \warning If you are accessing 32-bpp image data, cast the returned pointer to \c{QRgb*} (QRgb has a 32-bit size) and use it to diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 6da7265cfd..1b17759b5f 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -967,7 +967,9 @@ void QWindowsNativeFileDialogBase::doExec(HWND owner) const HRESULT hr = m_fileDialog->Show(owner); QWindowsDialogs::eatMouseMove(); qCDebug(lcQpaDialogs) << '<' << __FUNCTION__ << " returns " << hex << hr; - if (hr == S_OK) { + // Emit accepted() only if there is a result as otherwise UI hangs occur. + // For example, typing in invalid URLs results in empty result lists. + if (hr == S_OK && !m_data.selectedFiles().isEmpty()) { emit accepted(); } else { emit rejected(); diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index 821c40af81..be535c1846 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -33,8 +33,6 @@ SOURCES += \ RESOURCES += styles/qstyle.qrc -include($$OUT_PWD/qtwidgets-config.pri) - qtConfig(animation) { HEADERS += styles/qstyleanimation_p.h SOURCES += styles/qstyleanimation.cpp |