Migrate linux-clang mkspec out of unsupported
authorDonald Carr <donald.carr@nokia.com>
Thu, 28 Jun 2012 23:03:27 +0000 (23:03 +0000)
committerQt by Nokia <qt-info@nokia.com>
Sat, 30 Jun 2012 02:29:40 +0000 (04:29 +0200)
Change-Id: I84abc4c305c28e46dd514d3fb78d27c051dc6048
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
mkspecs/linux-clang/qmake.conf [moved from mkspecs/unsupported/linux-clang/qmake.conf with 70% similarity]
mkspecs/linux-clang/qplatformdefs.h [moved from mkspecs/unsupported/linux-clang/qplatformdefs.h with 98% similarity]

similarity index 70%
rename from mkspecs/unsupported/linux-clang/qmake.conf
rename to mkspecs/linux-clang/qmake.conf
index 6b63b7a..34045f4 100644 (file)
@@ -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++
 
similarity index 98%
rename from mkspecs/unsupported/linux-clang/qplatformdefs.h
rename to mkspecs/linux-clang/qplatformdefs.h
index 8600ef0..90d188e 100644 (file)
@@ -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