diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-24 20:30:12 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-28 15:43:04 +0200 |
commit | cb79be2076e3ba02b603f4ab65ca12cd99fa2eba (patch) | |
tree | c0d246fa9374233e394a5da5131fabdb01ad12ee | |
parent | 933ae0a0874f754e73fb8093fbad21382e526ca9 (diff) |
remove qt_no_framework_direct_includes from qt buildv5.1.0-rc2
only the include statements found in public headers are constrained to
work with this flag. our own c++ files and private headers can use other
styles, which this flag breaks.
Change-Id: Icb1ced17dc438083731049788ac28349c87ba7ef
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r-- | mkspecs/features/qt_module.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 238843942a..da4de5fa1e 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -90,7 +90,7 @@ else: \ #mac frameworks mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { #QMAKE_FRAMEWORK_VERSION = 4.0 - CONFIG += lib_bundle qt_no_framework_direct_includes 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)) { FRAMEWORK_HEADERS.version = Versions |