8 files changed, 82 insertions, 4 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 5d31f4c33a..73fc757c73 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -29,6 +29,7 @@ qt_add_module(Core
         global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h
         global/qprocessordetection.h
         global/qrandom.cpp global/qrandom.h global/qrandom_p.h
+        global/qsimd.cpp global/qsimd_p.h
         global/qsysinfo.h
         global/qsystemdetection.h
         global/qtypeinfo.h
@@ -211,7 +212,6 @@ qt_add_module(Core
         tools/qshareddata.cpp tools/qshareddata.h
         tools/qsharedpointer.cpp tools/qsharedpointer.h
         tools/qsharedpointer_impl.h
-        tools/qsimd.cpp tools/qsimd_p.h
         tools/qsize.cpp tools/qsize.h
         tools/qstack.h
         tools/qtaggedpointer.h
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index e28df10290..53d8de6668 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -45,6 +45,7 @@ qt_add_module(Core
         global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h
         global/qprocessordetection.h
         global/qrandom.cpp global/qrandom.h global/qrandom_p.h
+        global/qsimd.cpp global/qsimd_p.h
         global/qsysinfo.h
         global/qsystemdetection.h
         global/qtypeinfo.h
@@ -227,7 +228,6 @@ qt_add_module(Core
         tools/qshareddata.cpp tools/qshareddata.h
         tools/qsharedpointer.cpp tools/qsharedpointer.h
         tools/qsharedpointer_impl.h
-        tools/qsimd.cpp tools/qsimd_p.h
         tools/qsize.cpp tools/qsize.h
         tools/qstack.h
         tools/qtaggedpointer.h
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 1da69aba9b..389e866987 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -20,6 +20,7 @@ HEADERS +=  \
         global/qtypeinfo.h \
         global/qsysinfo.h \
         global/qisenum.h \
+        global/qsimd_p.h \
         global/qtypetraits.h \
         global/qflags.h \
         global/qrandom.h \
@@ -38,6 +39,7 @@ SOURCES += \
         global/qoperatingsystemversion.cpp \
         global/qlogging.cpp \
         global/qrandom.cpp \
+        global/qsimd.cpp \
         global/qhooks.cpp
 
 # To get listed in IDEs
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/global/qsimd.cpp
index 75c380ee8a..75c380ee8a 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/global/qsimd.cpp
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/global/qsimd_p.h
index 26e98c4542..26e98c4542 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/global/qsimd_p.h
diff --git a/src/corelib/tools/qsimd_x86.cpp b/src/corelib/global/qsimd_x86.cpp
index 509af464b2..be17f44c09 100644
--- a/src/corelib/tools/qsimd_x86.cpp
+++ b/src/corelib/global/qsimd_x86.cpp
@@ -1,3 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module 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$
+**
+****************************************************************************/
+
 // This is a generated file. DO NOT EDIT.
 // Please see util/x86simdgen/generate.pl
 #include "qsimd_p.h"
diff --git a/src/corelib/tools/qsimd_x86_p.h b/src/corelib/global/qsimd_x86_p.h
index 2434e2b797..82e3008a24 100644
--- a/src/corelib/tools/qsimd_x86_p.h
+++ b/src/corelib/global/qsimd_x86_p.h
@@ -1,3 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module 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$
+**
+****************************************************************************/
+
 // This is a generated file. DO NOT EDIT.
 // Please see util/x86simdgen/generate.pl
 #ifndef QSIMD_P_H
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index d7c66e85be..607a6eaf06 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -40,7 +40,6 @@ HEADERS +=  \
         tools/qsharedpointer.h \
         tools/qsharedpointer_impl.h \
         tools/qset.h \
-        tools/qsimd_p.h \
         tools/qsize.h \
         tools/qstack.h \
         tools/qtools_p.h \
@@ -67,7 +66,6 @@ SOURCES += \
         tools/qringbuffer.cpp \
         tools/qshareddata.cpp \
         tools/qsharedpointer.cpp \
-        tools/qsimd.cpp \
         tools/qsize.cpp \
         tools/qversionnumber.cpp