From 951ad62f0e505e25ebd664c5e1e10d2951d9ded1 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Thu, 27 Oct 2011 11:40:02 +0300
Subject: [PATCH] [qt] Removed unnecessary dependencies

---
 platform/platform.pro                      |  4 ++--
 platform/platform_tests/platform_tests.pro | 10 ++++++++--
 qt/qt.pro                                  |  8 ++++++--
 storage/storage_tests/storage_tests.pro    |  6 ++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/platform/platform.pro b/platform/platform.pro
index 186f3ad740..d1a2cd44d0 100644
--- a/platform/platform.pro
+++ b/platform/platform.pro
@@ -10,8 +10,7 @@ DEPENDENCIES = coding base jansson
 include($$ROOT_DIR/common.pri)
 
 !iphone*:!android*:!bada {
-  QT *= core network
-
+  QT *= core
   INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
 
   SOURCES += platform_qt.cpp \
@@ -46,6 +45,7 @@ macx*|iphone* {
 }
 
 win32*|linux* {
+  QT *= network
   HEADERS += qt_download_manager.hpp \
              qt_download.hpp
   SOURCES += qt_download_manager.cpp \
diff --git a/platform/platform_tests/platform_tests.pro b/platform/platform_tests/platform_tests.pro
index 0bc18cf5fa..1748f65b66 100644
--- a/platform/platform_tests/platform_tests.pro
+++ b/platform/platform_tests/platform_tests.pro
@@ -12,13 +12,19 @@ INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src
 
 DEFINES *= OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP
 
-QT *= core network
+QT *= core
 
 win32* {
   LIBS *= -lShell32
   win32-g++: LIBS *= -lpthread
 }
-macx*: LIBS *= "-framework Foundation" "-framework IOKit"
+macx* {
+  QT *= gui # needed for QApplication with event loop, to test async events (downloader, etc.)
+  LIBS *= "-framework Foundation" "-framework IOKit"
+}
+win32*:linux* {
+  QT *= network
+}
 
 SOURCES += \
     ../../testing/testingmain.cpp \
diff --git a/qt/qt.pro b/qt/qt.pro
index 74ea4ffad9..30e2b5347e 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -8,15 +8,19 @@ include($$ROOT_DIR/common.pri)
 TARGET = MapsWithMe
 TEMPLATE = app
 
-QT *= core gui opengl network
+QT *= core gui opengl
 
-win32 {
+win32* {
   LIBS += -lopengl32 -lws2_32 -lshell32 -liphlpapi
   RC_FILE = res/windows.rc
   win32-msvc*: LIBS += -lwlanapi
   win32-g++: LIBS += -lpthread
 }
 
+win32*|linux* {
+  QT *= network
+}
+
 macx* {
   LIBS *= "-framework CoreLocation" "-framework Foundation" "-framework CoreWLAN" \
           "-framework QuartzCore" "-framework IOKit"
diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro
index a489096f65..2887e62bab 100644
--- a/storage/storage_tests/storage_tests.pro
+++ b/storage/storage_tests/storage_tests.pro
@@ -10,12 +10,10 @@ DEPENDENCIES = storage indexer platform coding base jansson tomcrypt
 
 include($$ROOT_DIR/common.pri)
 
-QT *= network
-
-win32: LIBS *= -lshell32
+win32*: LIBS *= -lshell32
 macx*: LIBS *= "-framework Foundation" "-framework IOKit"
 
-QT += core
+QT *= core
 
 HEADERS +=