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

This reverts commit da88ec21cd.

This was not the right solution

monav/contractionhierarchies/binaryheap.h

@@ -24,7 +24,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <vector>
-#include <QtCore/QHash>
+#include <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 <QtCore/QFile>
-#include <QtCore/QHash>
+#include <QFile>
+#include <QHash>
 #include <limits>
-#include <QtCore/QtDebug>
+#include <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 <QtCore/QString>
-#include <QtCore/QFile>
+#include <QString>
+#include <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 <QtCore/QtDebug>
+#include <QtDebug>
 #include <stack>
 #ifndef NOGUI
-	#include <QtGui/QMessageBox>
+	#include <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 <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 #include "interfaces/irouter.h"
 #include "binaryheap.h"
 #include "compressedgraph.h"