diff --git a/mkspecs/devices/common/linux_arm_device_post.conf b/mkspecs/devices/common/linux_arm_device_post.conf
index 8e5d8e6968..b450db03db 100644
--- a/mkspecs/devices/common/linux_arm_device_post.conf
+++ b/mkspecs/devices/common/linux_arm_device_post.conf
@@ -1,7 +1,7 @@
 contains(DISTRO_OPTS, hard-float) {
     COMPILER_FLAGS += -mfloat-abi=hard
     LINKER_FLAGS   += -mfloat-abi=hard
-} else {
+} else: !contains(DISTRO_OPTS, aarch64) {
     COMPILER_FLAGS += -mfloat-abi=softfp
     LINKER_FLAGS   += -mfloat-abi=softfp
 }
diff --git a/mkspecs/devices/linux-drive-cx-g++/qmake.conf b/mkspecs/devices/linux-drive-cx-g++/qmake.conf
new file mode 100644
index 0000000000..cb43c9e2f6
--- /dev/null
+++ b/mkspecs/devices/linux-drive-cx-g++/qmake.conf
@@ -0,0 +1,38 @@
+#
+# qmake configuration for 64-bit Tegra X1 boards, like the DRIVE CX, using Vibrante Linux
+#
+# A typical configure line might look like:
+# configure \
+#   -device drive-cx \
+#   -device-option VIBRANTE_SDK_TOPDIR=/opt/nvidia/vibrante-t186ref-linux
+#   -device-option CROSS_COMPILE=/opt/nvidia/toolchains/tegra-4.9-nv/usr/bin/aarch64-gnu-linux/aarch64-gnu-linux- \
+#   -sysroot /opt/nvidia/vibrante-t186ref-linux/targetfs \
+#   -no-gcc-sysroot
+
+include(../common/linux_device_pre.conf)
+
+isEmpty(VIBRANTE_SDK_TOPDIR):error("You must pass -device-option VIBRANTE_SDK_TOPDIR=/path/to/sdk")
+
+QMAKE_INCDIR += \
+    $${VIBRANTE_SDK_TOPDIR}/include \
+    $$[QT_SYSROOT]/usr/include
+
+QMAKE_LIBDIR += \
+    $${VIBRANTE_SDK_TOPDIR}/lib-target \
+    $$[QT_SYSROOT]/usr/lib \
+    $$[QT_SYSROOT]/lib/aarch64-linux-gnu \
+    $$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu
+
+QMAKE_LFLAGS += \
+    -Wl,-rpath-link,$${VIBRANTE_SDK_TOPDIR}/lib-target \
+    -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib \
+    -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu \
+    -Wl,-rpath-link,$$[QT_SYSROOT]/lib/aarch64-linux-gnu
+
+DISTRO_OPTS                  += aarch64
+COMPILER_FLAGS               += -mtune=cortex-a57.cortex-a53 -march=armv8-a -DWIN_INTERFACE_CUSTOM
+
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
+
+include(../common/linux_arm_device_post.conf)
+load(qt_config)
diff --git a/mkspecs/devices/linux-drive-cx-g++/qplatformdefs.h b/mkspecs/devices/linux-drive-cx-g++/qplatformdefs.h
new file mode 100644
index 0000000000..e927f75015
--- /dev/null
+++ b/mkspecs/devices/linux-drive-cx-g++/qplatformdefs.h
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"