Merge "Merge branch 'release' into stable" into refs/staging/stable
This commit is contained in:
commit
55bf01828a
@ -61,6 +61,9 @@ defineTest(qtAddModule) {
|
|||||||
MODULE_CONFIG = $$eval(QT.$${1}.module_config)
|
MODULE_CONFIG = $$eval(QT.$${1}.module_config)
|
||||||
MODULE_MAJOR_VERSION = $$eval(QT.$${1}.MAJOR_VERSION)
|
MODULE_MAJOR_VERSION = $$eval(QT.$${1}.MAJOR_VERSION)
|
||||||
|
|
||||||
|
isEmpty(MODULE_INCLUDES):!if(auto_use_privates|isEqual(2, UsePrivate)): \
|
||||||
|
error("Module $$1 has no public API.")
|
||||||
|
|
||||||
qtProcessModuleFlags(CONFIG, QT.$${1}.CONFIG)
|
qtProcessModuleFlags(CONFIG, QT.$${1}.CONFIG)
|
||||||
qtProcessModuleFlags(DEFINES, QT.$${1}.DEFINES)
|
qtProcessModuleFlags(DEFINES, QT.$${1}.DEFINES)
|
||||||
|
|
||||||
|
@ -36,7 +36,8 @@ TARGET = tst_headersclean
|
|||||||
|
|
||||||
includes =
|
includes =
|
||||||
for(q, QT) {
|
for(q, QT) {
|
||||||
qn = $$eval(QT.$${q}.name)
|
sq = $$replace(q, -private\$, )
|
||||||
|
qn = $$eval(QT.$${sq}.name)
|
||||||
isEmpty(qn): \
|
isEmpty(qn): \
|
||||||
QT -= $$q
|
QT -= $$q
|
||||||
else: \
|
else: \
|
||||||
|
@ -91,7 +91,6 @@ else: \
|
|||||||
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
|
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
|
||||||
#QMAKE_FRAMEWORK_VERSION = 4.0
|
#QMAKE_FRAMEWORK_VERSION = 4.0
|
||||||
CONFIG += lib_bundle qt_framework
|
CONFIG += lib_bundle qt_framework
|
||||||
CONFIG -= qt_install_headers #no need to install these as well
|
|
||||||
!debug_and_release|if(build_all:CONFIG(release, debug|release)) {
|
!debug_and_release|if(build_all:CONFIG(release, debug|release)) {
|
||||||
FRAMEWORK_HEADERS.version = Versions
|
FRAMEWORK_HEADERS.version = Versions
|
||||||
FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
|
FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport
|
QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport-private
|
||||||
load(qt_headersclean)
|
load(qt_headersclean)
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user