From 4e50a45aadfa0e89bd0e65f6d9342d1e2abc389f Mon Sep 17 00:00:00 2001 From: greshilov Date: Thu, 21 Dec 2017 00:20:48 +0300 Subject: [qmake] Goodbye QMake! +3party dirs +Rebased --- traffic/traffic.pro | 17 ----------------- traffic/traffic_tests/traffic_tests.pro | 28 ---------------------------- 2 files changed, 45 deletions(-) delete mode 100644 traffic/traffic.pro delete mode 100644 traffic/traffic_tests/traffic_tests.pro (limited to 'traffic') diff --git a/traffic/traffic.pro b/traffic/traffic.pro deleted file mode 100644 index c02074c080..0000000000 --- a/traffic/traffic.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = traffic -TEMPLATE = lib -CONFIG += staticlib warn_on - -ROOT_DIR = .. - -include($$ROOT_DIR/common.pri) - -SOURCES += \ - speed_groups.cpp \ - traffic_cache.cpp \ - traffic_info.cpp \ - -HEADERS += \ - speed_groups.hpp \ - traffic_cache.hpp \ - traffic_info.hpp \ diff --git a/traffic/traffic_tests/traffic_tests.pro b/traffic/traffic_tests/traffic_tests.pro deleted file mode 100644 index 1b18ffe541..0000000000 --- a/traffic/traffic_tests/traffic_tests.pro +++ /dev/null @@ -1,28 +0,0 @@ -TARGET = traffic_tests -CONFIG += console warn_on -CONFIG -= app_bundle -TEMPLATE = app - -ROOT_DIR = ../.. - -DEPENDENCIES = traffic routing_common indexer platform_tests_support platform coding geometry base stats_client protobuf icu - -include($$ROOT_DIR/common.pri) - -DEFINES *= OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP -INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src - -QT *= core - -macx-* { - QT *= widgets # needed for QApplication with event loop, to test async events - LIBS *= "-framework IOKit" "-framework SystemConfiguration" -} - -win*|linux* { - QT *= network -} - -SOURCES += \ - $$ROOT_DIR/testing/testingmain.cpp \ - traffic_info_test.cpp \ -- cgit v1.2.3