From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:41:01 +0200
Subject: Just put everything new in. Conflict resolution will be later

---
 ftnoir_tracker_base/ftnoir_tracker_base_global.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ftnoir_tracker_base/ftnoir_tracker_base_global.h')

diff --git a/ftnoir_tracker_base/ftnoir_tracker_base_global.h b/ftnoir_tracker_base/ftnoir_tracker_base_global.h
index 9f4a6118..a449c282 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_base_global.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_base_global.h
@@ -1,7 +1,7 @@
 #ifndef FTNOIR_TRACKER_BASE_GLOBAL_H
 #define FTNOIR_TRACKER_BASE_GLOBAL_H
 
-#include <Qt/qglobal.h>
+#include <QtGlobal>
 
 #ifdef FTNOIR_TRACKER_BASE_LIB
 # define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_EXPORT
-- 
cgit v1.2.3