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, 111 deletions

diff --git a/qfunctionconfigurator/broken/qfunctionconfiguratorplugin.cpp b/qfunctionconfigurator/broken/qfunctionconfiguratorplugin.cpp
deleted file mode 100644
index 1a9da10ac..000000000
--- a/qfunctionconfigurator/broken/qfunctionconfiguratorplugin.cpp
+++ /dev/null
@@ -1,111 +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.
- */
-#include "qfunctionconfigurator.h"
-
-#include <QtCore/QtPlugin>
-#include "qfunctionconfiguratorplugin.h"
-
-
-QFunctionConfiguratorPlugin::QFunctionConfiguratorPlugin(QObject *parent)
-	: QObject(parent)
-{
-	initialized = false;
-}
-
-void QFunctionConfiguratorPlugin::initialize(QDesignerFormEditorInterface *)
-{
-	if (initialized)
-		return;
-
-	initialized = true;
-}
-
-bool QFunctionConfiguratorPlugin::isInitialized() const
-{
-	return initialized;
-}
-
-QWidget *QFunctionConfiguratorPlugin::createWidget(QWidget *parent)
-{
-	return new QFunctionConfigurator(parent);
-}
-
-QString QFunctionConfiguratorPlugin::name() const
-{
-	return "QFunctionConfigurator";
-}
-
-QString QFunctionConfiguratorPlugin::group() const
-{
-	return "My Plugins";
-}
-
-QIcon QFunctionConfiguratorPlugin::icon() const
-{
-	return QIcon();
-}
-
-QString QFunctionConfiguratorPlugin::toolTip() const
-{
-	return QString();
-}
-
-QString QFunctionConfiguratorPlugin::whatsThis() const
-{
-	return QString();
-}
-
-bool QFunctionConfiguratorPlugin::isContainer() const
-{
-	return false;
-}
-
-QString QFunctionConfiguratorPlugin::domXml() const
-{
-	return "<widget class=\"QFunctionConfigurator\" name=\"qFunctionA\">\n"
-		" <property name=\"geometry\">\n"
-		"  <rect>\n"
-		"   <x>0</x>\n"
-		"   <y>0</y>\n"
-		"   <width>161</width>\n"
-		"   <height>220</height>\n"
-		"  </rect>\n"
-		" </property>\n"
-		" <property name=\"colorBezier\">\n"
-		"  <color>\n"
-		"   <red>255</red>\n"
-		"   <green>170</green>\n"
-		"   <blue>0</blue>\n"
-		"  </color>\n"
-		" </property>\n"
-		" <property name=\"stringInputEGU\" stdset=\"0\">\n"
-		"  <string>Input Yaw (degr.)</string>\n"
-		" </property>\n"
-		" <property name=\"stringOutputEGU\" stdset=\"0\">\n"
-		"  <string>Output Yaw (degr.)</string>\n"
-		" </property>\n"
-		" <property name=\"maxInputEGU\" stdset=\"0\">\n"
-		" <number>50</number>\n"
-		" </property>\n"
-		" <property name=\"maxOutputEGU\" stdset=\"0\">\n"
-		" <number>180</number>\n"
-		" </property>\n"
-		" <property name=\"pixPerEGU_Input\" stdset=\"0\">\n"
-		" <number>2</number>\n"
-		" </property>\n"
-		" <property name=\"pixPerEGU_Output\" stdset=\"0\">\n"
-		" <number>1</number>\n"
-		" </property>\n"
-	   "</widget>\n";
-}
-
-QString QFunctionConfiguratorPlugin::includeFile() const
-{
-	return "qfunctionconfigurator.h";
-}
-
-Q_EXPORT_PLUGIN2(qfunctionconfigurator, QFunctionConfiguratorPlugin)