From 1edfd56d48f55480bf2259174a366c9c20baebe5 Mon Sep 17 00:00:00 2001
From: Fredrik Larrson <hayvosh@gmail.com>
Date: Sat, 16 Nov 2013 19:18:36 +1100
Subject: [PATCH] For controls and Dialogs, use Copydir directive as all qml
 files are needed and this is the "easy way", the other solution is to list
 every single qml file by hand, these will likely be added to in upcomming
 releases of Qt and cause maintaince.

The downside is three debug DLLs get copied also, if required I can expand
copydata.pro to delete them after the copy if required.

As we are making some changes to the build system, this at least enables
working builds of QtQuick2, if before packaging we do not have a better
solution, I will make sure the extra debug DLLs are removed.
---
 ground/openpilotgcs/copydata.pro | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro
index 9a462bd91..8212cc25b 100644
--- a/ground/openpilotgcs/copydata.pro
+++ b/ground/openpilotgcs/copydata.pro
@@ -73,9 +73,6 @@ equals(copydata, 1) {
         # create QtQuick2 plugin directories
         QT_QUICK2_DIRS = qtquick \
                          qtquick.2 \
-                         qtquick/controls \
-                         qtquick/controls/private \
-                         qtquick/dialogs \
                          qtquick/layouts \
                          qtquick/localstorage \
                          qtquick/particles.2 \
@@ -86,18 +83,19 @@ equals(copydata, 1) {
             data_copy.commands += -@$(MKDIR) $$targetPath(\"$$GCS_APP_PATH/$$dir\") $$addNewline()
         }
 
+        # Copy QtQuick2 complete directories
+        # These directories have a lot of files
+        # Easier to copy everything
+        QTQ_WHOLE_DIRS = qtquick/controls \
+                         qtquick/dialogs
+        for(dir, QTQ_WHOLE_DIRS) {
+            data_copy.commands += $(COPY_DIR) $$targetPath(\"$$[QT_INSTALL_QML]/$$dir\") $$targetPath(\"$$GCS_APP_PATH/$$dir\") $$addNewline()
+        }
+
         # copy QtQuick plugin DLLs
         QT_QUICK2_DLLS = QtQuick.2/qtquick2plugin$${DS}.dll \
                          QtQuick.2/plugins.qmltypes \
                          QtQuick.2/qmldir \
-        qtquick/controls/qtquickcontrolsplugin$${DS}.dll \
-        qtquick/controls/plugins.qmltypes \
-        qtquick/controls/qmldir \
-        qtquick/controls/private/qtquickcontrolsprivateplugin$${DS}.dll \
-        qtquick/controls/private/qmldir \
-        qtquick/dialogs/dialogplugin$${DS}.dll \
-        qtquick/dialogs/plugins.qmltypes \
-        qtquick/dialogs/qmldir \
         qtquick/layouts/qquicklayoutsplugin$${DS}.dll \
         qtquick/layouts/plugins.qmltypes \
         qtquick/layouts/qmldir \