pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[qt] Fixed compilation

Browse source
This commit is contained in:
Alex Zolotarev 2013-07-07 16:17:44 +03:00 • committed by Alex Zolotarev
parent 440b639e8b
commit f70fe79886
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/platform_tests/platform_tests.pro
View file

@ -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* {

2
qt/qt.pro
View file

@ -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

7
testing/testingmain.cpp
View file

@ -8,8 +8,13 @@
#include "../std/target_os.hpp"
#ifdef OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP
#include <Qt>
#ifdef OMIM_OS_MAC // on Mac OS X native run loop works only for QApplication :(
#include <QtWidgets/QApplication>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <QtGui/QApplication>
#else
#include <QtWidgets/QApplication>
#endif
#define QAPP QApplication
#else
#include <QtCore/QCoreApplication>