Merge branch 'unstable' into trackhat

* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name

1 files changed, 0 insertions, 36 deletions

diff --git a/qfunctionconfigurator/broken/qfunctionconfiguratorplugin.h b/qfunctionconfigurator/broken/qfunctionconfiguratorplugin.h
deleted file mode 100644
index ca68e0e20..000000000
--- a/qfunctionconfigurator/broken/qfunctionconfiguratorplugin.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (c) 2011-2012 Stanislaw Halik <sthalik@misaki.pl>
- *                         Adapted to FaceTrackNoIR by Wim Vriend.
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-#ifndef QFUNCTIONCONFIGURATORPLUGIN_H
-#define QFUNCTIONCONFIGURATORPLUGIN_H
-
-#include <QDesignerCustomWidgetInterface>
-
-class QFunctionConfiguratorPlugin : public QObject, public QDesignerCustomWidgetInterface
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "analogclock.json")
-    Q_INTERFACES(QDesignerCustomWidgetInterface)
-
-public:
-    QFunctionConfiguratorPlugin(QObject *parent = 0);
-
-    bool isContainer() const;
-    bool isInitialized() const;
-    QIcon icon() const;
-    QString domXml() const;
-    QString group() const;
-    QString includeFile() const;
-    QString name() const;
-    QString toolTip() const;
-    QString whatsThis() const;
-    QWidget *createWidget(QWidget *parent);
-    void initialize(QDesignerFormEditorInterface *core);
-private:
-    bool initialized;
-};
-
-#endif // QFUNCTIONCONFIGURATORPLUGIN_H