diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 8b65db95cb..8d3dbe3ecf 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -257,7 +257,7 @@ function(QT5_ADD_BINARY_RESOURCES target ) add_custom_command(OUTPUT ${rcc_destination} COMMAND ${Qt5Core_RCC_EXECUTABLE} ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} - DEPENDS ${rc_depends} ${out_depends} VERBATIM) + DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) add_custom_target(${target} ALL DEPENDS ${rcc_destination}) endfunction() diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index db40b37da9..c0ace26f28 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2834,6 +2834,10 @@ void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatc If QCoreApplication is deleted and another QCoreApplication is created, the startup function will be invoked again. + + \note This macro is not suitable for use in library code that is then + statically linked into an application since the function may not be called + at all due to being eliminated by the linker. */ /*! |