diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-06-28 23:03:27 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-30 04:29:40 +0200 |
| commit | 0bfa3569e2e0f37f86be7fbae9408fd410f4461e (patch) | |
| tree | 93fc14cd1f598abc6d08dee9ddbc5afa42abacd3 | |
| parent | 985292b0a36487d009bab932adbe9baeb92661dd (diff) | |
Migrate linux-clang mkspec out of unsupported
Change-Id: I84abc4c305c28e46dd514d3fb78d27c051dc6048
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/linux-clang/qmake.conf (renamed from mkspecs/unsupported/linux-clang/qmake.conf) | 6 | ||||
| -rw-r--r-- | mkspecs/linux-clang/qplatformdefs.h (renamed from mkspecs/unsupported/linux-clang/qplatformdefs.h) | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mkspecs/unsupported/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf index 6b63b7a06e..34045f4401 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 index 8600ef085b..90d188ef93 100644 --- a/mkspecs/unsupported/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h @@ -57,7 +57,6 @@ #include <unistd.h> - // We are hot - unistd.h should have turned on the specific APIs we requested #include <features.h> @@ -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 |