projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2fb578
)
Make the CONFIG and QT_CONFIG contents available downstream.
author
Stephen Kelly
<stephen.kelly@kdab.com>
Thu, 1 Mar 2012 10:37:51 +0000
(11:37 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Fri, 2 Mar 2012 14:55:29 +0000
(15:55 +0100)
Change-Id: I62dbc5a695e41179de9f6acd11aa7bc592cac6f3
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
src/corelib/Qt5CoreConfigExtras.cmake.in
patch
|
blob
|
history
diff --git
a/src/corelib/Qt5CoreConfigExtras.cmake.in
b/src/corelib/Qt5CoreConfigExtras.cmake.in
index
67598f4
..
5acc13c
100644
(file)
--- a/
src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/
src/corelib/Qt5CoreConfigExtras.cmake.in
@@
-30,6
+30,9
@@
list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
set(QT_LIBINFIX \"$${QT_LIBINFIX}\")
!!ENDIF
+set(QT_CONFIG \"$${CONFIG}\")
+set(QT_QCONFIG \"$${QT_CONFIG}\")
+
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
set(Qt5Core_QTMAIN_LIBRARIES Qt5::WinMain)