first try to fix building with OpenWRT toolchain that does not include QtCore and QtGui in the include path

monav/contractionhierarchies/binaryheap.h

@@ -24,7 +24,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <vector>
-#include <QHash>
+#include <QtCore/QHash>
 
 template< typename NodeID, typename Key >
 class ArrayStorage {

monav/contractionhierarchies/blockcache.h

@@ -20,10 +20,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef BLOCKCACHE_H_INCLUDED
 #define BLOCKCACHE_H_INCLUDED
 
-#include <QFile>
-#include <QHash>
+#include <QtCore/QFile>
+#include <QtCore/QHash>
 #include <limits>
-#include <QtDebug>
+#include <QtCore/QtDebug>
 
 // Block must have member function / variables:
 // variable id => block id

monav/contractionhierarchies/compressedgraph.h

@@ -24,8 +24,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/coordinates.h"
 #include "utils/bithelpers.h"
 #include "blockcache.h"
-#include <QString>
-#include <QFile>
+#include <QtCore/QString>
+#include <QtCore/QFile>
 #include <algorithm>
 #include <vector>
 

monav/contractionhierarchies/contractionhierarchiesclient.cpp

@@ -22,10 +22,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "contractionhierarchiesclient.h"
 #include "utils/qthelpers.h"
-#include <QtDebug>
+#include <QtCore/QtDebug>
 #include <stack>
 #ifndef NOGUI
-	#include <QMessageBox>
+	#include <QtGui/QMessageBox>
 #endif
 
 ContractionHierarchiesClient::ContractionHierarchiesClient()

monav/contractionhierarchies/contractionhierarchiesclient.h

@@ -20,8 +20,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONTRACTIONHIERARCHIESCLIENT_H
 #define CONTRACTIONHIERARCHIESCLIENT_H
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include "interfaces/irouter.h"
 #include "binaryheap.h"
 #include "compressedgraph.h"

monav/gpsgrid/gpsgridclient.cpp

@@ -18,14 +18,14 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "gpsgridclient.h"
-#include <QtDebug>
-#include <QHash>
+#include <QtCore/QtDebug>
+#include <QtCore/QHash>
 #include <algorithm>
 #include "utils/qthelpers.h"
 #ifndef NOGUI
-	#include <QInputDialog>
+	#include <QtGui/QInputDialog>
 #endif
-#include <QSettings>
+#include <QtCore/QSettings>
 
 GPSGridClient::GPSGridClient()
 {

monav/gpsgrid/gpsgridclient.h

@@ -20,12 +20,12 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef GPSGRIDCLIENT_H
 #define GPSGRIDCLIENT_H
 
-#include <QObject>
-#include <QFile>
+#include <QtCore/QObject>
+#include <QtCore/QFile>
 #include "interfaces/igpslookup.h"
 #include "cell.h"
 #include "table.h"
-#include <QCache>
+#include <QtCore/QCache>
 
 class GPSGridClient : public QObject, public IGPSLookup
 {

monav/gpsgrid/table.h

@@ -20,12 +20,12 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef TABLE_H
 #define TABLE_H
 
-#include <QtGlobal>
-#include <QCache>
-#include <QFile>
+#include <QtCore/QtGlobal>
+#include <QtCore/QCache>
+#include <QtCore/QFile>
 #include <string.h>
 #include <vector>
-#include <QtDebug>
+#include <QtCore/QtDebug>
 
 namespace gg {
 

monav/interfaces/iaddresslookup.h

@@ -21,8 +21,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #define IADDRESSLOOKUP_H
 
 #include "utils/coordinates.h"
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 class IAddressLookup
 {

monav/interfaces/igpslookup.h

@@ -22,8 +22,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils/config.h"
 #include "utils/coordinates.h"
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 class IGPSLookup
 {

monav/interfaces/irouter.h

@@ -23,8 +23,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/config.h"
 #include "utils/coordinates.h"
 #include "interfaces/igpslookup.h"
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 class IRouter
 {

monav/unicodetournamenttrie/trie.h

@@ -20,7 +20,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef TRIE_H
 #define TRIE_H
 
-#include <QString>
+#include <QtCore/QString>
 #include <vector>
 #include "utils/coordinates.h"
 #include "utils/bithelpers.h"

monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp

@@ -23,10 +23,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "unicodetournamenttrieclient.h"
 #include "utils/qthelpers.h"
-#include <QtDebug>
+#include <QtCore/QtDebug>
 #include <algorithm>
 #ifndef NOGUI
- #include <QMessageBox>
+ #include <QtGui/QMessageBox>
 #endif
 
 UnicodeTournamentTrieClient::UnicodeTournamentTrieClient()

monav/unicodetournamenttrie/unicodetournamenttrieclient.h

@@ -20,9 +20,9 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef UNICODETOURNAMENTTRIECLIENT_H
 #define UNICODETOURNAMENTTRIECLIENT_H
 
-#include <QObject>
-#include <QtPlugin>
-#include <QFile>
+#include <QtCore/QObject>
+#include <QtCore/QtPlugin>
+#include <QtCore/QFile>
 #include "interfaces/iaddresslookup.h"
 #include "trie.h"
 

monav/utils/edgeconnector.h

@@ -22,7 +22,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils/coordinates.h"
 #include <vector>
-#include <QMultiHash>
+#include <QtCore/QMultiHash>
 #include <algorithm>
 
 static uint qHash( const UnsignedCoordinate& key )

monav/utils/qthelpers.h

@@ -20,11 +20,11 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef QTHELPERS_H
 #define QTHELPERS_H
 
-#include <QFile>
-#include <QtDebug>
-#include <QDataStream>
-#include <QTime>
-#include <QDir>
+#include <QtCore/QFile>
+#include <QtCore/QtDebug>
+#include <QtCore/QDataStream>
+#include <QtCore/QTime>
+#include <QtCore/QDir>
 
 static inline QString fileInDirectory( QString directory, QString filename )
 {