From 24ba39cfa6d43da90dfd4ee34498a466d970bdd9 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 1 Jan 2014 16:41:37 -0800
Subject: [PATCH] Fixed up some XBee stuff for building

---
 .gitignore                       | 1 +
 src/ui/XbeeConfigurationWindow.h | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ef18c0fb..049dc09e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ user_config.pri
 thirdParty/qserialport-build-desktop/
 thirdParty/qserialport/bin/
 thirdParty/qserialport/lib/
+libs/thirdParty/libxbee/lib/
 GeneratedFiles/
 
 *.autosave
diff --git a/src/ui/XbeeConfigurationWindow.h b/src/ui/XbeeConfigurationWindow.h
index 549414f21..e78531b6d 100644
--- a/src/ui/XbeeConfigurationWindow.h
+++ b/src/ui/XbeeConfigurationWindow.h
@@ -7,9 +7,9 @@
 #include <QTimer>
 #include <QShowEvent>
 #include <QHideEvent>
-#include<QtGui\qcombobox.h>
-#include<QtGui\qlabel.h>
-#include<QtGui\qlayout.h>
+#include <QComboBox>
+#include <QLabel>
+#include <QLayout>
 #include <LinkInterface.h>
 #include"XbeeLinkInterface.h"
 #include "../comm/HexSpinBox.h"
@@ -62,4 +62,4 @@ signals:
 };
 
 
-#endif //_XBEECONFIGURATIONWINDOW_H_
\ No newline at end of file
+#endif //_XBEECONFIGURATIONWINDOW_H_
-- 
2.22.0