summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_base/ftnoir_tracker_base_global.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-02 18:41:01 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-02 18:41:01 +0200
commit8303597a865400a363ae574ccde819302495f498 (patch)
treec83b383b3ec818f610cc6137f2b72ee7b4173b09 /ftnoir_tracker_base/ftnoir_tracker_base_global.h
parent8adf6b1650af6027f28db12ca2b4de92a3fac11d (diff)
Just put everything new in. Conflict resolution will be later
Diffstat (limited to 'ftnoir_tracker_base/ftnoir_tracker_base_global.h')
-rw-r--r--ftnoir_tracker_base/ftnoir_tracker_base_global.h2
1 files changed, 1 insertions, 1 deletions
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