diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-21 16:16:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-24 20:20:59 +0200 |
| commit | 363cebe6b197e228d9f4bbb37566c9a594c122d7 (patch) | |
| tree | 4b0c7d1f9b335fa44967eef9f8e55b1ef163bed3 /mkspecs | |
| parent | b66a217a1c0517376a730c391c2c1bb45c7eb271 (diff) | |
purge auto_use_privates module option
it was introduced as a hack to simplify writing tests, but the change to
make use of it was backed out of testlib and nobody seems to care.
Change-Id: Icc86621b865276e86593afdb923247bbdca19d49
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 04375d4ce1..d13b9bb8d5 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -62,7 +62,7 @@ qaxserver { unset(using_privates) qtAddModules(QT, LIBS) qtAddModules(QT_PRIVATE, LIBS_PRIVATE) -!isEmpty(using_privates):!auto_use_privates:!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) { +!isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) { message("This project is using private headers and will therefore be tied to this specific Qt module build version.") message("Running this project against other versions of the Qt modules may crash at any arbitrary point.") message("This is not a bug, but a result of using Qt internals. You have been warned!") diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f1f7c00b9e..4f4f4e00c0 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -61,7 +61,7 @@ defineTest(qtAddModule) { MODULE_CONFIG = $$eval(QT.$${1}.module_config) MODULE_MAJOR_VERSION = $$eval(QT.$${1}.MAJOR_VERSION) - contains(MODULE_CONFIG, internal_module):!if(auto_use_privates|isEqual(2, UsePrivate)): \ + contains(MODULE_CONFIG, internal_module):!isEqual(2, UsePrivate): \ error("Module $$1 has no public API.") qtProcessModuleFlags(CONFIG, QT.$${1}.CONFIG) @@ -77,7 +77,7 @@ defineTest(qtAddModule) { !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { INCLUDEPATH *= $$FRAMEWORK_INCLUDE } - auto_use_privates|isEqual(2, UsePrivate): \ + isEqual(2, UsePrivate): \ INCLUDEPATH += \ $$FRAMEWORK_INCLUDE/$$eval(QT.$${1}.VERSION) \ $$FRAMEWORK_INCLUDE/$$eval(QT.$${1}.VERSION)/$$MODULE_NAME @@ -85,7 +85,7 @@ defineTest(qtAddModule) { LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX} } else { INCLUDEPATH *= $$MODULE_INCLUDES - auto_use_privates|isEqual(2, UsePrivate): \ + isEqual(2, UsePrivate): \ INCLUDEPATH += $$eval(QT.$${1}.private_includes) } @@ -147,7 +147,6 @@ defineTest(qtAddModules) { NEWQT += $$eval(QT.$${QTLIBRAW}.private_depends) } NEWQT += $$QTLIBRAW - contains(QT.$${QTLIBRAW}.CONFIG, auto_use_privates): CONFIG += auto_use_privates } # Topological resolution of modules based on their QT.<module>.depends variable $$1 = $$resolve_depends(NEWQT, "QT.") |