From a8d449aba0e2aefba623a40d2ea92335e2fa64b7 Mon Sep 17 00:00:00 2001
From: goldenhawking <goldenhawking@163.com>
Date: Sat, 21 Mar 2020 13:16:54 +0800
Subject: [PATCH] improve pro file struct

---
 qtviewer_planetosm/qtaxviewer_planetosm.pro              | 8 ++------
 qtviewer_planetosm/qtviewer_planetosm.pro                | 4 ++--
 qtviewer_planetosm/qtwidget_planetosm.pro                | 4 ++--
 qtvplugin_geomarker/qtvplugin_geomarker.pro              | 4 ++--
 qtvplugin_grid/qtvplugin_grid.pro                        | 4 ++--
 .../qtwidget_planetosm_designer.pro                      | 7 +++----
 test_container/test_container.pro                        | 9 +++------
 7 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/qtviewer_planetosm/qtaxviewer_planetosm.pro b/qtviewer_planetosm/qtaxviewer_planetosm.pro
index fe2668c..3102f34 100644
--- a/qtviewer_planetosm/qtaxviewer_planetosm.pro
+++ b/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
 
diff --git a/qtviewer_planetosm/qtviewer_planetosm.pro b/qtviewer_planetosm/qtviewer_planetosm.pro
index e717b57..b89e318 100644
--- a/qtviewer_planetosm/qtviewer_planetosm.pro
+++ b/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 \
diff --git a/qtviewer_planetosm/qtwidget_planetosm.pro b/qtviewer_planetosm/qtwidget_planetosm.pro
index 88784d4..30bdb52 100644
--- a/qtviewer_planetosm/qtwidget_planetosm.pro
+++ b/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
 
diff --git a/qtvplugin_geomarker/qtvplugin_geomarker.pro b/qtvplugin_geomarker/qtvplugin_geomarker.pro
index 7759b4b..c4b16bb 100644
--- a/qtvplugin_geomarker/qtvplugin_geomarker.pro
+++ b/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 += \
diff --git a/qtvplugin_grid/qtvplugin_grid.pro b/qtvplugin_grid/qtvplugin_grid.pro
index c519bdb..54ed4de 100644
--- a/qtvplugin_grid/qtvplugin_grid.pro
+++ b/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 += \
diff --git a/qtwidget_planetosm_designer/qtwidget_planetosm_designer.pro b/qtwidget_planetosm_designer/qtwidget_planetosm_designer.pro
index 2a42422..b4ac90c 100644
--- a/qtwidget_planetosm_designer/qtwidget_planetosm_designer.pro
+++ b/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
diff --git a/test_container/test_container.pro b/test_container/test_container.pro
index adb3f4f..2ec3aef 100644
--- a/test_container/test_container.pro
+++ b/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
-- 
GitLab