qmake project fix

generator/generator.pro

@@ -14,53 +14,56 @@ INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src $$ROOT_DIR/3party/expat/lib \
 QT *= core
 
 SOURCES += \
-    feature_merger.cpp \
-    xml_element.cpp \
-    osm_source.cpp \
-    feature_generator.cpp \
-    feature_sorter.cpp \
-    update_generator.cpp \
-    statistics.cpp \
-    osm2type.cpp \
     borders_generator.cpp \
-    osm_xml_parser.cpp \
     borders_loader.cpp \
-    dumper.cpp \
-    unpack_mwm.cpp \
-    feature_builder.cpp \
-    osm_id.cpp \
-    osm_decl.cpp \
-    coastlines_generator.cpp \
-    tesselator.cpp \
     check_model.cpp \
+    coastlines_generator.cpp \
+    dumper.cpp \
+    feature_builder.cpp \
+    feature_generator.cpp \
+    feature_merger.cpp \
+    feature_sorter.cpp \
+    osm2type.cpp \
+    osm_decl.cpp \
+    osm_id.cpp \
+    osm_source.cpp \
+    osm_xml_parser.cpp \
     routing_generator.cpp \
+    statistics.cpp \
+    tesselator.cpp \
+    unpack_mwm.cpp \
+    update_generator.cpp \
+    xml_element.cpp \
 
 HEADERS += \
-    feature_merger.hpp \
-    xml_element.hpp \
-    osm_element.hpp \
-    feature_generator.hpp \
-    first_pass_parser.hpp \
-    data_cache_file.hpp \
-    feature_sorter.hpp \
-    update_generator.hpp \
-    statistics.hpp \
-    polygonizer.hpp \
-    world_map_generator.hpp \
-    osm2type.hpp \
     borders_generator.hpp \
-    osm_xml_parser.hpp \
     borders_loader.hpp \
-    feature_emitter_iface.hpp \
-    dumper.hpp \
-    generate_info.hpp \
-    unpack_mwm.hpp \
-    feature_builder.hpp \
-    osm_id.hpp \
-    osm_decl.hpp \
-    coastlines_generator.hpp \
-    tesselator.hpp \
     check_model.hpp \
-    ways_merger.hpp \
+    coastlines_generator.hpp \
+    data_cache_file.hpp \
+    dumper.hpp \
+    feature_builder.hpp \
+    feature_emitter_iface.hpp \
+    feature_generator.hpp \
+    feature_merger.hpp \
+    feature_sorter.hpp \
+    first_pass_parser.hpp \
     gen_mwm_info.hpp \
+    generate_info.hpp \
+    osm2type.hpp \
+    osm_decl.hpp \
+    osm_element.hpp \
+    osm_id.hpp \
+    osm_o5m_source.hpp \
+    osm_xml_parser.hpp \
+    polygonizer.hpp \
     routing_generator.hpp \
+    source_reader.hpp \
+    statistics.hpp \
+    tesselator.hpp \
+    unpack_mwm.hpp \
+    update_generator.hpp \
+    ways_merger.hpp \
+    world_map_generator.hpp \
+    xml_element.hpp \
+

generator/generator_tests/generator_tests.pro

@@ -22,13 +22,14 @@ HEADERS += \
 
 SOURCES += \
     ../../testing/testingmain.cpp \
-    osm_parser_test.cpp \
-    feature_merger_test.cpp \
-    osm_type_test.cpp \
-    osm_id_test.cpp \
-    tesselator_test.cpp \
-    triangles_tree_coding_test.cpp \
+    check_mwms.cpp \
+    classificator_tests.cpp \
     coasts_test.cpp \
     feature_builder_test.cpp \
-    classificator_tests.cpp \
-    check_mwms.cpp \
+    feature_merger_test.cpp \
+    osm_id_test.cpp \
+    osm_o5m_source_test.cpp \
+    osm_parser_test.cpp \
+    osm_type_test.cpp \
+    tesselator_test.cpp \
+    triangles_tree_coding_test.cpp \