diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-04 10:50:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 10:50:27 +0200 |
| commit | 55bf01828a36ff6b32c7164a08eebcda7fb1cc7d (patch) | |
| tree | 050e451667e707df41072b578b1b2fa71da2de84 /mkspecs | |
| parent | 77196b9dc3caa7dda1072a64ed953bf7231b1af3 (diff) | |
| parent | 645637cbdca2835e261d866ea7ea858027c454e9 (diff) | |
Merge "Merge branch 'release' into stable" into refs/staging/stable
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_headersclean.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index cd74c1d7cf..83d0821830 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -61,6 +61,9 @@ defineTest(qtAddModule) { MODULE_CONFIG = $$eval(QT.$${1}.module_config) 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(DEFINES, QT.$${1}.DEFINES) diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf index 4128392997..ab0a722628 100644 --- a/mkspecs/features/qt_headersclean.prf +++ b/mkspecs/features/qt_headersclean.prf @@ -36,7 +36,8 @@ TARGET = tst_headersclean includes = for(q, QT) { - qn = $$eval(QT.$${q}.name) + sq = $$replace(q, -private\$, ) + qn = $$eval(QT.$${sq}.name) isEmpty(qn): \ QT -= $$q else: \ diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index da4de5fa1e..53a5499545 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -91,7 +91,6 @@ else: \ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { #QMAKE_FRAMEWORK_VERSION = 4.0 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)) { FRAMEWORK_HEADERS.version = Versions FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES |