qxt-mini: don't copy qt headers around

3 files changed, 2 insertions, 100 deletions

diff --git a/qxt-mini/CMakeLists.txt b/qxt-mini/CMakeLists.txt
index f355b943..21b2b160 100644
--- a/qxt-mini/CMakeLists.txt
+++ b/qxt-mini/CMakeLists.txt
@@ -1,5 +1,6 @@
 if(UNIX OR APPLE)
     set(self opentrack-qxt-mini)
+    include_directories(SYSTEM ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
     otr_module(qxt-mini NO-COMPAT BIN)
     if(APPLE)
         target_link_options(${self} PUBLIC -framework Carbon -framework CoreFoundation)
diff --git a/qxt-mini/qplatformnativeinterface.h b/qxt-mini/qplatformnativeinterface.h
deleted file mode 100644
index eaa24a9e..00000000
--- a/qxt-mini/qplatformnativeinterface.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtGui 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPLATFORMNATIVEINTERFACE_H
-#define QPLATFORMNATIVEINTERFACE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is part of the QPA API and is not meant to be used
-// in applications. Usage of this API may make your code
-// source and binary incompatible with future versions of Qt.
-//
-
-#include <QtGui/qwindowdefs.h>
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
-
-QT_BEGIN_NAMESPACE
-
-
-class QOpenGLContext;
-class QScreen;
-class QWindow;
-class QPlatformWindow;
-class QBackingStore;
-
-class Q_GUI_EXPORT QPlatformNativeInterface : public QObject
-{
-    Q_OBJECT
-public:
-    virtual void *nativeResourceForIntegration(const QByteArray &resource);
-    virtual void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context);
-    virtual void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen);
-    virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
-    virtual void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *backingStore);
-
-    typedef void * (*NativeResourceForIntegrationFunction)();
-    typedef void * (*NativeResourceForContextFunction)(QOpenGLContext *context);
-    typedef void * (*NativeResourceForScreenFunction)(QScreen *screen);
-    typedef void * (*NativeResourceForWindowFunction)(QWindow *window);
-    typedef void * (*NativeResourceForBackingStoreFunction)(QBackingStore *backingStore);
-    virtual NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource);
-    virtual NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource);
-    virtual NativeResourceForScreenFunction nativeResourceFunctionForScreen(const QByteArray &resource);
-    virtual NativeResourceForWindowFunction nativeResourceFunctionForWindow(const QByteArray &resource);
-    virtual NativeResourceForBackingStoreFunction nativeResourceFunctionForBackingStore(const QByteArray &resource);
-
-    virtual QVariantMap windowProperties(QPlatformWindow *window) const;
-    virtual QVariant windowProperty(QPlatformWindow *window, const QString &name) const;
-    virtual QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const;
-    virtual void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value);
-
-Q_SIGNALS:
-    void windowPropertyChanged(QPlatformWindow *window, const QString &propertyName);
-};
-
-QT_END_NAMESPACE
-
-#endif // QPLATFORMNATIVEINTERFACE_H
diff --git a/qxt-mini/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp
index 2609aa7c..adf25b6b 100644
--- a/qxt-mini/qxtglobalshortcut_x11.cpp
+++ b/qxt-mini/qxtglobalshortcut_x11.cpp
@@ -37,7 +37,7 @@
 #include <QPair>
 #include <QKeyEvent>
 #include <QApplication>
-#include "qplatformnativeinterface.h"
+#include <qpa/qplatformnativeinterface.h>
 
 #include "x11-keymap.hpp"