From f70fe79886fe2e869bfe498dfa2daf83dca5dbfe Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 7 Jul 2013 16:17:44 +0300 Subject: [PATCH] [qt] Fixed compilation --- platform/platform_tests/platform_tests.pro | 2 +- qt/qt.pro | 2 +- testing/testingmain.cpp | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/platform/platform_tests/platform_tests.pro b/platform/platform_tests/platform_tests.pro index 8a9169bdfe..02f25d5668 100644 --- a/platform/platform_tests/platform_tests.pro +++ b/platform/platform_tests/platform_tests.pro @@ -19,7 +19,7 @@ win32* { win32-g++: LIBS *= -lpthread } macx-* { - QT *= widgets # needed for QApplication with event loop, to test async events (downloader, etc.) + QT *= gui widgets # needed for QApplication with event loop, to test async events (downloader, etc.) LIBS *= "-framework Foundation" "-framework IOKit" "-framework QuartzCore" } win32*|linux* { diff --git a/qt/qt.pro b/qt/qt.pro index aa9cd02f8b..ca19193796 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -9,7 +9,7 @@ include($$ROOT_DIR/common.pri) TARGET = MapsWithMe TEMPLATE = app -QT *= core gui opengl +QT *= core widgets gui opengl win32* { LIBS += -lopengl32 -lws2_32 -lshell32 -liphlpapi diff --git a/testing/testingmain.cpp b/testing/testingmain.cpp index d78ecc39ce..1216cc9390 100644 --- a/testing/testingmain.cpp +++ b/testing/testingmain.cpp @@ -8,8 +8,13 @@ #include "../std/target_os.hpp" #ifdef OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP + #include #ifdef OMIM_OS_MAC // on Mac OS X native run loop works only for QApplication :( - #include + #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + #include + #else + #include + #endif #define QAPP QApplication #else #include