improve pro file struct

qtviewer_planetosm/qtaxviewer_planetosm.pro

@@ -6,14 +6,10 @@
 
 QT       += core gui network axserver
 linux:QMAKE_CXXFLAGS += -std=c++11
-win32-g++{
-	QMAKE_CXXFLAGS += -std=c++11
-	CONFIG += no_lflags_merge
-	LIBS += -lQt5AxServer -lQt5AxBase -lole32 -loleaut32 -luser32 -lgdi32 -ladvapi32 -luuid
-}
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = ../../bin/qtaxviewer_planetosm
+TARGET = qtaxviewer_planetosm
+DESTDIR = $$OUT_PWD/../bin
 TEMPLATE = lib
 CONFIG  += dll
 

qtviewer_planetosm/qtviewer_planetosm.pro

@@ -8,9 +8,9 @@ QT       += core gui network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 linux:QMAKE_CXXFLAGS += -std=c++11  -fPIC
 win32-g++:QMAKE_CXXFLAGS += -std=c++11
-TARGET = ../../bin/qtviewer_planetosm
+TARGET = qtviewer_planetosm
 TEMPLATE = app
-
+DESTDIR = $$OUT_PWD/../bin
 
 SOURCES += main.cpp\
 	osm_frame_widget.cpp \

qtviewer_planetosm/qtwidget_planetosm.pro

@@ -8,8 +8,8 @@ QT       += core gui network designer
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 linux:QMAKE_CXXFLAGS += -std=c++11 -fPIC
 win32-g++:QMAKE_CXXFLAGS += -std=c++11
-TARGET = ../../bin/qtwidget_planetosm
-
+TARGET = qtwidget_planetosm
+DESTDIR = $$OUT_PWD/../bin
 TEMPLATE    = lib
 CONFIG += dll
 

qtvplugin_geomarker/qtvplugin_geomarker.pro

@@ -7,9 +7,9 @@
 QT       += widgets
 linux:QMAKE_CXXFLAGS += -std=c++11
 win32-g++:QMAKE_CXXFLAGS += -std=c++11
-TARGET = ../../bin/qtvplugin_geomarker
+TARGET = qtvplugin_geomarker
 TEMPLATE = lib
-
+DESTDIR = $$OUT_PWD/../bin
 DEFINES += QTVPLUGIN_GEOMARKER_LIBRARY
 
 SOURCES += \

qtvplugin_grid/qtvplugin_grid.pro

@@ -7,9 +7,9 @@
 QT       += widgets
 linux:QMAKE_CXXFLAGS += -std=c++11
 win32-g++:QMAKE_CXXFLAGS += -std=c++11
-TARGET = ../../bin/qtvplugin_grid
+TARGET = qtvplugin_grid
 TEMPLATE = lib
-
+DESTDIR = $$OUT_PWD/../bin
 DEFINES += QTVPLUGIN_GRID_LIBRARY
 
 SOURCES += \

qtwidget_planetosm_designer/qtwidget_planetosm_designer.pro

@@ -7,12 +7,11 @@
 QT       += widgets network designer
 linux:QMAKE_CXXFLAGS += -std=c++11
 win32-g++:QMAKE_CXXFLAGS += -std=c++11
-TARGET = ../../bin/qtwidget_planetosm_designer
+TARGET = qtwidget_planetosm_designer
+DESTDIR = $$OUT_PWD/../bin
 TEMPLATE = lib
 
-win32:LIBS += -L$$OUT_PWD/../bin
-linux:LIBS += -L$$OUT_PWD/../../bin
-
+LIBS += -L$$DESTDIR
 LIBS += -lqtwidget_planetosm
 
 DEFINES += QTWIDGET_PLANETOSM_DESIGNER_LIBRARY

test_container/test_container.pro

@@ -9,11 +9,10 @@ win32: QT+= axcontainer
 linux: QMAKE_CXXFLAGS += -std=c++11
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = ../../bin/test_container
+TARGET = test_container
 TEMPLATE = app
-
-win32:LIBS += -L$$OUT_PWD/../bin
-linux:LIBS += -L$$OUT_PWD/../../bin
+DESTDIR = $$OUT_PWD/../bin
+LIBS += -L$$DESTDIR
 
 LIBS += -lqtwidget_planetosm
 INCLUDEPATH += $$PWD/../qtviewer_planetosm
@@ -28,8 +27,6 @@ win32:contains(DEFINES,BUILD_ACTIVEX_OSM){
     SOURCES += testcontainer.cpp
 win32-g++{
 	QMAKE_CXXFLAGS += -std=c++11
-	CONFIG += no_lflags_merge
-	LIBS += -lQt5AxContainer -lQt5AxBase -lole32 -loleaut32 -luser32 -lgdi32 -ladvapi32 -luuid
 }
 } else {
     FORMS    += testcontainer_linux.ui