diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-04 01:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-04 01:00:07 +0200 |
| commit | f80b7995f3e5bc289f3255dfe914e1acde328af2 (patch) | |
| tree | 6cb3e1043532c8157a3163f3b1630c6486cb440f /src/corelib/plugin | |
| parent | c4d46723eb8cd17b17b87df230d502a071f4ac19 (diff) | |
| parent | 06d753e87b71e6b02bbe937b488c8598c9945521 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia7328524f2cd9d5995ac8705f0fe0bf570b2e831
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 6635286f76..0e32776c71 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -999,7 +999,7 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, const QString &ver /*! Returns the address of the exported symbol \a symbol. The library is - loaded if necessary. The function returns 0 if the symbol could + loaded if necessary. The function returns \nullptr if the symbol could not be resolved or if the library could not be loaded. Example: @@ -1032,7 +1032,7 @@ QFunctionPointer QLibrary::resolve(const char *symbol) include the platform-specific file suffix; (see \l{fileName}). The library remains loaded until the application exits. - The function returns 0 if the symbol could not be resolved or if + The function returns \nullptr if the symbol could not be resolved or if the library could not be loaded. \sa resolve() @@ -1052,7 +1052,7 @@ QFunctionPointer QLibrary::resolve(const QString &fileName, const char *symbol) (see \l{fileName}). The library remains loaded until the application exits. \a verNum is ignored on Windows. - The function returns 0 if the symbol could not be resolved or if + The function returns \nullptr if the symbol could not be resolved or if the library could not be loaded. \sa resolve() @@ -1073,7 +1073,7 @@ QFunctionPointer QLibrary::resolve(const QString &fileName, int verNum, const ch (see \l{fileName}). The library remains loaded until the application exits. \a version is ignored on Windows. - The function returns 0 if the symbol could not be resolved or if + The function returns \nullptr if the symbol could not be resolved or if the library could not be loaded. \sa resolve() diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 0f94bb6adf..00480198bd 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -174,7 +174,7 @@ QPluginLoader::~QPluginLoader() /*! Returns the root component object of the plugin. The plugin is - loaded if necessary. The function returns 0 if the plugin could + loaded if necessary. The function returns \nullptr if the plugin could not be loaded or if the root component object could not be instantiated. |