From 0bfa3569e2e0f37f86be7fbae9408fd410f4461e Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Thu, 28 Jun 2012 23:03:27 +0000 Subject: [PATCH] Migrate linux-clang mkspec out of unsupported Change-Id: I84abc4c305c28e46dd514d3fb78d27c051dc6048 Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- mkspecs/{unsupported => }/linux-clang/qmake.conf | 6 +++--- mkspecs/{unsupported => }/linux-clang/qplatformdefs.h | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) rename mkspecs/{unsupported => }/linux-clang/qmake.conf (70%) rename mkspecs/{unsupported => }/linux-clang/qplatformdefs.h (98%) diff --git a/mkspecs/unsupported/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf similarity index 70% rename from mkspecs/unsupported/linux-clang/qmake.conf rename to mkspecs/linux-clang/qmake.conf index 6b63b7a..34045f4 100644 --- a/mkspecs/unsupported/linux-clang/qmake.conf +++ b/mkspecs/linux-clang/qmake.conf @@ -10,9 +10,9 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -include(../../common/linux.conf) -include(../../common/gcc-base-unix.conf) -include(../../common/clang.conf) +include(../common/linux.conf) +include(../common/gcc-base-unix.conf) +include(../common/clang.conf) QMAKE_LFLAGS += -ccc-gcc-name g++ diff --git a/mkspecs/unsupported/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h similarity index 98% rename from mkspecs/unsupported/linux-clang/qplatformdefs.h rename to mkspecs/linux-clang/qplatformdefs.h index 8600ef0..90d188e 100644 --- a/mkspecs/unsupported/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h @@ -57,7 +57,6 @@ #include - // We are hot - unistd.h should have turned on the specific APIs we requested #include @@ -83,7 +82,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS -#include "../../common/posix/qplatformdefs.h" +#include "../common/posix/qplatformdefs.h" #undef QT_SOCKLEN_T @@ -98,5 +97,4 @@ #define QT_VSNPRINTF ::vsnprintf #endif - #endif // QPLATFORMDEFS_H -- 2.7.4