From 7b959d6fdbbc8f1444f0cd1c8672465dc2651523 Mon Sep 17 00:00:00 2001
From: EspoTek <admin@espotek.com>
Date: Wed, 30 Nov 2016 10:58:34 +1100
Subject: [PATCH] Changed default search directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

functionGenControl and espoComboBox now use QCoreApplication::
applicationDirPath().  This is to fix deploys on Mac.  It’s possible
but unlikely that it broke Windows/Linux.


Former-commit-id: 3bcf78e4c47d2e9928bbbceee7e9ae9ec226c0ee
---
 Desktop Interface/Labrador.pro.user.REMOVED.git-id              | 2 +-
 Desktop Interface/Makefile.REMOVED.git-id                       | 2 +-
 .../bin/labrador.app/Contents/MacOS/Labrador.REMOVED.git-id     | 2 +-
 Desktop Interface/espocombobox.o.REMOVED.git-id                 | 2 +-
 Desktop Interface/functiongencontrol.cpp.REMOVED.git-id         | 2 +-
 Desktop Interface/functiongencontrol.h.REMOVED.git-id           | 2 +-
 Desktop Interface/functiongencontrol.o.REMOVED.git-id           | 2 +-
 Desktop Interface/isobuffer.o.REMOVED.git-id                    | 2 +-
 Desktop Interface/isodriver.cpp.REMOVED.git-id                  | 2 +-
 Desktop Interface/isodriver.o.REMOVED.git-id                    | 2 +-
 Desktop Interface/mainwindow.o.REMOVED.git-id                   | 2 +-
 Desktop Interface/moc_buffercontrol.cpp.REMOVED.git-id          | 2 +-
 Desktop Interface/moc_cursorenabler.cpp.REMOVED.git-id          | 2 +-
 Desktop Interface/moc_deviceconnecteddisplay.cpp.REMOVED.git-id | 2 +-
 Desktop Interface/moc_espocombobox.cpp.REMOVED.git-id           | 2 +-
 Desktop Interface/moc_esposlider.cpp.REMOVED.git-id             | 2 +-
 Desktop Interface/moc_espospinbox.cpp.REMOVED.git-id            | 2 +-
 Desktop Interface/moc_mainwindow.cpp.REMOVED.git-id             | 2 +-
 Desktop Interface/moc_mainwindow.o.REMOVED.git-id               | 2 +-
 Desktop Interface/moc_noclosemenu.cpp.REMOVED.git-id            | 2 +-
 Desktop Interface/moc_qcustomplot.cpp.REMOVED.git-id            | 2 +-
 Desktop Interface/moc_timedtickbox.cpp.REMOVED.git-id           | 2 +-
 Desktop Interface/moc_voltagespinbox.cpp.REMOVED.git-id         | 2 +-
 Desktop Interface/ui_elements/espocombobox.cpp.REMOVED.git-id   | 2 +-
 Desktop Interface/unixusbdriver.cpp.REMOVED.git-id              | 2 +-
 Desktop Interface/unixusbdriver.o.REMOVED.git-id                | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Desktop Interface/Labrador.pro.user.REMOVED.git-id b/Desktop Interface/Labrador.pro.user.REMOVED.git-id
index 8c8214bd..1dd0a610 100644
--- a/Desktop Interface/Labrador.pro.user.REMOVED.git-id	
+++ b/Desktop Interface/Labrador.pro.user.REMOVED.git-id	
@@ -1 +1 @@
-53c7d306c7b4db5bcd0219295ec2740d43e10c39
\ No newline at end of file
+81c201ef15967ef74f4fedfa2bc5f0a92121f896
\ No newline at end of file
diff --git a/Desktop Interface/Makefile.REMOVED.git-id b/Desktop Interface/Makefile.REMOVED.git-id
index e11fa758..18ce0279 100644
--- a/Desktop Interface/Makefile.REMOVED.git-id	
+++ b/Desktop Interface/Makefile.REMOVED.git-id	
@@ -1 +1 @@
-c483289d4f65f6209f1cf8f9f0023654b66056b6
\ No newline at end of file
+9e9bfd7b423cd87c2d4f11953db5ace742c5a213
\ No newline at end of file
diff --git a/Desktop Interface/bin/labrador.app/Contents/MacOS/Labrador.REMOVED.git-id b/Desktop Interface/bin/labrador.app/Contents/MacOS/Labrador.REMOVED.git-id
index 95826846..97068b44 100644
--- a/Desktop Interface/bin/labrador.app/Contents/MacOS/Labrador.REMOVED.git-id	
+++ b/Desktop Interface/bin/labrador.app/Contents/MacOS/Labrador.REMOVED.git-id	
@@ -1 +1 @@
-bb72fac59b238c82ce3a4544da4ebdb5263b05ba
\ No newline at end of file
+ff182e8888d9a4a39ca8d53f9846778a8480feff
\ No newline at end of file
diff --git a/Desktop Interface/espocombobox.o.REMOVED.git-id b/Desktop Interface/espocombobox.o.REMOVED.git-id
index 2e96a720..a9ca366c 100644
--- a/Desktop Interface/espocombobox.o.REMOVED.git-id	
+++ b/Desktop Interface/espocombobox.o.REMOVED.git-id	
@@ -1 +1 @@
-3645823fb1e61704ef147c3a77fc3673b093e869
\ No newline at end of file
+b86793fff6027085ae718a203c9e8f3cb761c423
\ No newline at end of file
diff --git a/Desktop Interface/functiongencontrol.cpp.REMOVED.git-id b/Desktop Interface/functiongencontrol.cpp.REMOVED.git-id
index 83e96edf..d97e277c 100644
--- a/Desktop Interface/functiongencontrol.cpp.REMOVED.git-id	
+++ b/Desktop Interface/functiongencontrol.cpp.REMOVED.git-id	
@@ -1 +1 @@
-75e717f1ee2036372e0fb788951f9d0de9585844
\ No newline at end of file
+0acf8fbff94bbd2a5cb4bd8087d2e9deda81c492
\ No newline at end of file
diff --git a/Desktop Interface/functiongencontrol.h.REMOVED.git-id b/Desktop Interface/functiongencontrol.h.REMOVED.git-id
index eff23e19..9a2c1bf3 100644
--- a/Desktop Interface/functiongencontrol.h.REMOVED.git-id	
+++ b/Desktop Interface/functiongencontrol.h.REMOVED.git-id	
@@ -1 +1 @@
-ee0d45ba9fd2d8356c87a18698bd912df81d4439
\ No newline at end of file
+34be187fa53633a79922c8aa427226dced3858af
\ No newline at end of file
diff --git a/Desktop Interface/functiongencontrol.o.REMOVED.git-id b/Desktop Interface/functiongencontrol.o.REMOVED.git-id
index b84ea26f..8a4c655d 100644
--- a/Desktop Interface/functiongencontrol.o.REMOVED.git-id	
+++ b/Desktop Interface/functiongencontrol.o.REMOVED.git-id	
@@ -1 +1 @@
-b0f67bbc71570b9099af4e171ab2b62124b369a8
\ No newline at end of file
+0e0e3b896036640eedc1d0420a94a196a836c65c
\ No newline at end of file
diff --git a/Desktop Interface/isobuffer.o.REMOVED.git-id b/Desktop Interface/isobuffer.o.REMOVED.git-id
index cddee191..d488aac6 100644
--- a/Desktop Interface/isobuffer.o.REMOVED.git-id	
+++ b/Desktop Interface/isobuffer.o.REMOVED.git-id	
@@ -1 +1 @@
-3913e393feb5392c75cc6b610063acca471c1670
\ No newline at end of file
+7c839baf2dc67074aa10794d5fdf760076f77119
\ No newline at end of file
diff --git a/Desktop Interface/isodriver.cpp.REMOVED.git-id b/Desktop Interface/isodriver.cpp.REMOVED.git-id
index 847fbbbe..b65d356f 100644
--- a/Desktop Interface/isodriver.cpp.REMOVED.git-id	
+++ b/Desktop Interface/isodriver.cpp.REMOVED.git-id	
@@ -1 +1 @@
-1f575a55d408a112a5e465ddfc003d8627086a72
\ No newline at end of file
+c67db7e605bbe60293c197abf4554055830eea23
\ No newline at end of file
diff --git a/Desktop Interface/isodriver.o.REMOVED.git-id b/Desktop Interface/isodriver.o.REMOVED.git-id
index 8e14e99e..22db092e 100644
--- a/Desktop Interface/isodriver.o.REMOVED.git-id	
+++ b/Desktop Interface/isodriver.o.REMOVED.git-id	
@@ -1 +1 @@
-8a3caaf9c1dbed7205cfd016798537c17a7810b9
\ No newline at end of file
+7f4670d9ba3a57bc22893c53ab7f85accc45f183
\ No newline at end of file
diff --git a/Desktop Interface/mainwindow.o.REMOVED.git-id b/Desktop Interface/mainwindow.o.REMOVED.git-id
index 58725b25..70e9c01c 100644
--- a/Desktop Interface/mainwindow.o.REMOVED.git-id	
+++ b/Desktop Interface/mainwindow.o.REMOVED.git-id	
@@ -1 +1 @@
-b6b7a92ee3fd0eccacdfdabe0eb00c53b4b94a39
\ No newline at end of file
+2867b270222a378e1ecfa0a1a61a9d6ea18dd52a
\ No newline at end of file
diff --git a/Desktop Interface/moc_buffercontrol.cpp.REMOVED.git-id b/Desktop Interface/moc_buffercontrol.cpp.REMOVED.git-id
index 6381568a..891390da 100644
--- a/Desktop Interface/moc_buffercontrol.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_buffercontrol.cpp.REMOVED.git-id	
@@ -1 +1 @@
-2d1541f1857014c7532f94a2c19c376623ed4543
\ No newline at end of file
+6e16d929d8c1ee71b573acf246cb4f80c133a9a2
\ No newline at end of file
diff --git a/Desktop Interface/moc_cursorenabler.cpp.REMOVED.git-id b/Desktop Interface/moc_cursorenabler.cpp.REMOVED.git-id
index f8697f16..095f7169 100644
--- a/Desktop Interface/moc_cursorenabler.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_cursorenabler.cpp.REMOVED.git-id	
@@ -1 +1 @@
-331d14f6675b2af268d6f6d09fccdf2fdbdf6312
\ No newline at end of file
+80c4631331589ec208e0e5011d92bbc5079b4937
\ No newline at end of file
diff --git a/Desktop Interface/moc_deviceconnecteddisplay.cpp.REMOVED.git-id b/Desktop Interface/moc_deviceconnecteddisplay.cpp.REMOVED.git-id
index a2558431..f9481017 100644
--- a/Desktop Interface/moc_deviceconnecteddisplay.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_deviceconnecteddisplay.cpp.REMOVED.git-id	
@@ -1 +1 @@
-dbfc9a8c3149720f77452e697b01729221f65a72
\ No newline at end of file
+60c62bba8b5ba85032a77c4ae86504bdf2509f4a
\ No newline at end of file
diff --git a/Desktop Interface/moc_espocombobox.cpp.REMOVED.git-id b/Desktop Interface/moc_espocombobox.cpp.REMOVED.git-id
index 17da7d0a..11bc88db 100644
--- a/Desktop Interface/moc_espocombobox.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_espocombobox.cpp.REMOVED.git-id	
@@ -1 +1 @@
-6586f1098d4b23759b38420006ee813ac9c97873
\ No newline at end of file
+1942a58436cc6efc1936f639c8db9c58692e7e72
\ No newline at end of file
diff --git a/Desktop Interface/moc_esposlider.cpp.REMOVED.git-id b/Desktop Interface/moc_esposlider.cpp.REMOVED.git-id
index 53903a11..bcc86fbe 100644
--- a/Desktop Interface/moc_esposlider.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_esposlider.cpp.REMOVED.git-id	
@@ -1 +1 @@
-61499f02af6793ef24614f1ad10bb20f8911b75a
\ No newline at end of file
+7a904963c7da100609297b0f4cc4c562b840d709
\ No newline at end of file
diff --git a/Desktop Interface/moc_espospinbox.cpp.REMOVED.git-id b/Desktop Interface/moc_espospinbox.cpp.REMOVED.git-id
index 215374a7..591a3783 100644
--- a/Desktop Interface/moc_espospinbox.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_espospinbox.cpp.REMOVED.git-id	
@@ -1 +1 @@
-07a1f95f819227260f4db26c039a250907be55b2
\ No newline at end of file
+bd3e80b42d5615c739762149bebb07615a6a8d00
\ No newline at end of file
diff --git a/Desktop Interface/moc_mainwindow.cpp.REMOVED.git-id b/Desktop Interface/moc_mainwindow.cpp.REMOVED.git-id
index 24803e16..366362ea 100644
--- a/Desktop Interface/moc_mainwindow.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_mainwindow.cpp.REMOVED.git-id	
@@ -1 +1 @@
-077377b62988d2016a5c5d067b0c5159e7636f84
\ No newline at end of file
+ddedefb8b563fc190ed7c70cac84431ddce75c4a
\ No newline at end of file
diff --git a/Desktop Interface/moc_mainwindow.o.REMOVED.git-id b/Desktop Interface/moc_mainwindow.o.REMOVED.git-id
index 719bdd3a..309e5b24 100644
--- a/Desktop Interface/moc_mainwindow.o.REMOVED.git-id	
+++ b/Desktop Interface/moc_mainwindow.o.REMOVED.git-id	
@@ -1 +1 @@
-e887a2e91788f63e3d26f1bbd16c1991207e9aa5
\ No newline at end of file
+600da756928f3b4ccece293f62f5c13e394cdf92
\ No newline at end of file
diff --git a/Desktop Interface/moc_noclosemenu.cpp.REMOVED.git-id b/Desktop Interface/moc_noclosemenu.cpp.REMOVED.git-id
index 8bd970c7..d18192b2 100644
--- a/Desktop Interface/moc_noclosemenu.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_noclosemenu.cpp.REMOVED.git-id	
@@ -1 +1 @@
-340b93925356da6376f8cb5209354e3b1a686d84
\ No newline at end of file
+9735787c6b05d042f4ec6e01af760df2929f6022
\ No newline at end of file
diff --git a/Desktop Interface/moc_qcustomplot.cpp.REMOVED.git-id b/Desktop Interface/moc_qcustomplot.cpp.REMOVED.git-id
index 1279e877..3a198df1 100644
--- a/Desktop Interface/moc_qcustomplot.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_qcustomplot.cpp.REMOVED.git-id	
@@ -1 +1 @@
-612a23b18b5fb5efa447860b3b9326d10ef3a2d2
\ No newline at end of file
+67eed2cd3595786c7e62f3b748fc9637939255f0
\ No newline at end of file
diff --git a/Desktop Interface/moc_timedtickbox.cpp.REMOVED.git-id b/Desktop Interface/moc_timedtickbox.cpp.REMOVED.git-id
index a563bca7..768fd398 100644
--- a/Desktop Interface/moc_timedtickbox.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_timedtickbox.cpp.REMOVED.git-id	
@@ -1 +1 @@
-21b29b3bf96fb505a86eec7c77b0ce6cf2de0ba8
\ No newline at end of file
+457be6664296261b647e1c1757f07d297168be15
\ No newline at end of file
diff --git a/Desktop Interface/moc_voltagespinbox.cpp.REMOVED.git-id b/Desktop Interface/moc_voltagespinbox.cpp.REMOVED.git-id
index 6cfadb61..bed3ed76 100644
--- a/Desktop Interface/moc_voltagespinbox.cpp.REMOVED.git-id	
+++ b/Desktop Interface/moc_voltagespinbox.cpp.REMOVED.git-id	
@@ -1 +1 @@
-3c981178eb8dd18ade02a15ad2485a22ae730004
\ No newline at end of file
+68968f90f08e37a9b141bd12ea0e5e88c14983f1
\ No newline at end of file
diff --git a/Desktop Interface/ui_elements/espocombobox.cpp.REMOVED.git-id b/Desktop Interface/ui_elements/espocombobox.cpp.REMOVED.git-id
index 72bdf656..132309c1 100644
--- a/Desktop Interface/ui_elements/espocombobox.cpp.REMOVED.git-id	
+++ b/Desktop Interface/ui_elements/espocombobox.cpp.REMOVED.git-id	
@@ -1 +1 @@
-e48f37603ded058ed5e798d7a0017cfec305ccf5
\ No newline at end of file
+483f0f82ce6320835b13e75191774e189e4c28b6
\ No newline at end of file
diff --git a/Desktop Interface/unixusbdriver.cpp.REMOVED.git-id b/Desktop Interface/unixusbdriver.cpp.REMOVED.git-id
index caac2171..351c1e64 100644
--- a/Desktop Interface/unixusbdriver.cpp.REMOVED.git-id	
+++ b/Desktop Interface/unixusbdriver.cpp.REMOVED.git-id	
@@ -1 +1 @@
-bfa52f101c7a5e1311b030a81494bcd4f6fb66ae
\ No newline at end of file
+e38f48a9ac0ca0162a4dbf3843c2e1b008b9d5ce
\ No newline at end of file
diff --git a/Desktop Interface/unixusbdriver.o.REMOVED.git-id b/Desktop Interface/unixusbdriver.o.REMOVED.git-id
index 2916a8ab..6ee0ad83 100644
--- a/Desktop Interface/unixusbdriver.o.REMOVED.git-id	
+++ b/Desktop Interface/unixusbdriver.o.REMOVED.git-id	
@@ -1 +1 @@
-784fb664f952a29af3536e862753881fcf42fed8
\ No newline at end of file
+074c1d0eda791a1f96661c4e3a63854a735af999
\ No newline at end of file