diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-12 08:00:04 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-12 08:00:04 +0000 |
| commit | c81966c39ebafebc6ceb2b0a8f8a39b9a08d1c14 (patch) | |
| tree | 84c542c2aaf6d9670b1e46d2acdac865e98a33b1 /src/corelib | |
| parent | e6c089ae288ffe729b0e4eaa968461e3d8b76c5a (diff) | |
| parent | f4d8cafc1b034f544ca84b849c23ab99bc1600e7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
2 files changed, 7 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/global/qglobal.h b/src/corelib/global/qglobal.h index c7d5c957ea..6a51ea3ab1 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -544,6 +544,12 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed; # define Q_ALWAYS_INLINE inline #endif +#ifdef Q_CC_GNU +# define QT_INIT_METAOBJECT __attribute__((init_priority(101))) +#else +# define QT_INIT_METAOBJECT +#endif + //defines the type for the WNDPROC on windows //the alignment needs to be forced for sse2 to not crash with mingw #if defined(Q_OS_WIN) |