[xcode-9] Fixed desktop app build.

14 files changed, 29 insertions, 29 deletions

diff --git a/qt/build_style/build_common.cpp b/qt/build_style/build_common.cpp
index 67bee224b9..b17c3545ce 100644
--- a/qt/build_style/build_common.cpp
+++ b/qt/build_style/build_common.cpp
@@ -2,11 +2,11 @@
 
 #include "platform/platform.hpp"
 
-#include <QCoreApplication>
-#include <QDir>
-#include <QFile>
-#include <QProcess>
-#include <QRegExp>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QProcess>
+#include <QtCore/QRegExp>
 
 #include <exception>
 
diff --git a/qt/build_style/build_common.h b/qt/build_style/build_common.h
index 113a219a57..ca3382ae43 100644
--- a/qt/build_style/build_common.h
+++ b/qt/build_style/build_common.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QString>
-#include <QProcessEnvironment>
+#include <QtCore/QString>
+#include <QtCore/QProcessEnvironment>
 
 #include <initializer_list>
 #include <string>
diff --git a/qt/build_style/build_drules.cpp b/qt/build_style/build_drules.cpp
index 7f6ec59258..3c8a680427 100644
--- a/qt/build_style/build_drules.cpp
+++ b/qt/build_style/build_drules.cpp
@@ -7,10 +7,10 @@
 #include <fstream>
 #include <streambuf>
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QStringList>
 
 namespace
 {
diff --git a/qt/build_style/build_drules.h b/qt/build_style/build_drules.h
index 61f718abe8..d9b0dba820 100644
--- a/qt/build_style/build_drules.h
+++ b/qt/build_style/build_drules.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/build_phone_pack.cpp b/qt/build_style/build_phone_pack.cpp
index ff91adea94..00c99d1a7c 100644
--- a/qt/build_style/build_phone_pack.cpp
+++ b/qt/build_style/build_phone_pack.cpp
@@ -4,8 +4,8 @@
 
 #include "platform/platform.hpp"
 
-#include <QDir>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QStringList>
 
 #include <exception>
 
diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp
index 82f713b572..7c576ae1f7 100644
--- a/qt/build_style/build_skins.cpp
+++ b/qt/build_style/build_skins.cpp
@@ -11,7 +11,7 @@
 #include <utility>
 #include <fstream>
 
-#include <QDir>
+#include <QtCore/QDir>
 
 namespace
 {
diff --git a/qt/build_style/build_skins.h b/qt/build_style/build_skins.h
index 50ca7312af..dade5701bd 100644
--- a/qt/build_style/build_skins.h
+++ b/qt/build_style/build_skins.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/build_statistics.cpp b/qt/build_style/build_statistics.cpp
index 0c6b3577ee..84b3a4765d 100644
--- a/qt/build_style/build_statistics.cpp
+++ b/qt/build_style/build_statistics.cpp
@@ -4,10 +4,10 @@
 
 #include "platform/platform.hpp"
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QStringList>
 
 #include <exception>
 
diff --git a/qt/build_style/build_statistics.h b/qt/build_style/build_statistics.h
index 9291f5fea7..6d59b7faca 100644
--- a/qt/build_style/build_statistics.h
+++ b/qt/build_style/build_statistics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/build_style.cpp b/qt/build_style/build_style.cpp
index 09d393da67..a22672af1c 100644
--- a/qt/build_style/build_style.cpp
+++ b/qt/build_style/build_style.cpp
@@ -11,9 +11,9 @@
 #include <exception>
 #include <future>
 
-#include <QFile>
-#include <QDir>
-#include <QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QCoreApplication>
 
 namespace
 {
diff --git a/qt/build_style/build_style.h b/qt/build_style/build_style.h
index 9b3bf45004..3a4a03f604 100644
--- a/qt/build_style/build_style.h
+++ b/qt/build_style/build_style.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/run_tests.h b/qt/build_style/run_tests.h
index c3e721b807..32263708ec 100644
--- a/qt/build_style/run_tests.h
+++ b/qt/build_style/run_tests.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <utility>
 
diff --git a/qt/drape_surface.hpp b/qt/drape_surface.hpp
index af845fd36c..0e81a95eba 100644
--- a/qt/drape_surface.hpp
+++ b/qt/drape_surface.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "qt/qtoglcontextfactory.hpp"
+#include "qtoglcontextfactory.hpp"
 
 #include "map/framework.hpp"
 #include "drape_frontend/drape_engine.hpp"
diff --git a/qt/main.cpp b/qt/main.cpp
index 9e089b1025..d41c72aa19 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -20,10 +20,10 @@
 #include "3party/Alohalytics/src/alohalytics.h"
 #include "3party/gflags/src/gflags/gflags.h"
 
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QtCore/QDir>
 #include <QtWidgets/QApplication>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 DEFINE_string(data_path, "", "Path to data directory");
 DEFINE_string(log_abort_level, my::ToString(my::GetDefaultLogAbortLevel()),