Cleanup .pro files, .gitignore

.gitignore

@@ -1,15 +1,27 @@
-.DS_Store
-build-Debug
-build-Release
-bin
-doc/html
-GPXLab.pro.user
+# C++ objects and libs
+*.o
+*.a
+
+# Qt-es
+.qmake.cache
 .qmake.stash
-GPXLab/.qmake.cache
-QMapControl/.qmake.cache
-Makefile
-GPXLab/Makefile
-QMapControl/Makefile
-GPXLab/tmp
-QMapControl/tmp
+*.pro.user
+*.pro.user.*
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+Makefile*
+*build-*
 *.qm
+
+# Binaries
+GPXLab
+!GPXLab/
+gpxlab
+
+# macOS
+.DS_Store
+
+# Doxygen
+doc/html

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## v0.7.0 (in development)
+## v0.7.0
 - [new] Use SRTM version 3.0 global 1 arc second data
 - [new] SRTM files must now be located in the QStandardPaths::AppDataLocation directory
 - [new] Settings to automatically reload the last opened file on startup

GPXLab/GPXLab.pro

@@ -17,17 +17,11 @@ DEFINES += ORGANISATION=\\\"$$ORGANISATION\\\" TARGET=\\\"$$TARGET\\\" VERSION=\
 
 win32:RC_ICONS += gpxlab.ico
 
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
-UI_DIR = tmp
-RCC_DIR = tmp
-DESTDIR = ../bin
-
 win32 {
-  LIBS += -L../bin/ -lqmapcontrol0
+  LIBS += -L../QMapControl/ -lqmapcontrol0
 }
 else {
-  LIBS += -L../bin/ -lqmapcontrol
+  LIBS += -L../QMapControl/ -lqmapcontrol
 }
 
 INCLUDEPATH += ../QMapControl/ gpx_model/ commands/ functions/ dialogs/ widgets/
@@ -138,25 +132,24 @@ TRANSLATIONS += \
 macx {
     ICON = ../pkg/gpxlab.icns
     QMAKE_INFO_PLIST = ../pkg/Info.plist
-    LOCALE.path = Contents/Resources/translations
-    LOCALE.files = locale/gpxlab_fi.qm \
-        locale/gpxlab_ru.qm
-    QMAKE_BUNDLE_DATA += LOCALE
+    locale.path = Contents/Resources/translations
+    locale.files = ./locale/gpxlab_fi.qm \
+        ./locale/gpxlab_ru.qm
+    QMAKE_BUNDLE_DATA += locale
 }
 
 unix:!macx {
     isEmpty(PREFIX):PREFIX = /usr/local
     DEFINES += PREFIX=\\\"$$PREFIX\\\"
 
-    TARGET.path = $$PREFIX/bin
-    TARGET.files = ../bin/gpxlab
-    LOCALE.path = $$PREFIX/share/bourgeoislab/gpxlab/translations
-    LOCALE.files = locale/*.qm
-    ICON.path = $$PREFIX/share/pixmaps
-    ICON.files = ../doc/gpxlab.png
-    DESKTOP.path = $$PREFIX/share/applications
-    DESKTOP.files = ../pkg/gpxlab.desktop
-    MIME.path = $$PREFIX/share/mime/packages
-    MIME.files = ../pkg/gpxlab.xml
-    INSTALLS += TARGET LOCALE ICON DESKTOP MIME
+    target.path = $$PREFIX/bin
+    locale.path = $$PREFIX/share/bourgeoislab/gpxlab/translations
+    locale.files = locale/*.qm
+    icon.path = $$PREFIX/share/pixmaps
+    icon.files = ../doc/gpxlab.png
+    desktop.path = $$PREFIX/share/applications
+    desktop.files = ../pkg/gpxlab.desktop
+    mime.path = $$PREFIX/share/mime/packages
+    mime.files = ../pkg/gpxlab.xml
+    INSTALLS += target locale icon desktop mime
 }

QMapControl/QMapControl.pro

@@ -12,12 +12,6 @@ TEMPLATE = lib
 
 DEFINES += QMAPCONTROL_LIBRARY
 
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
-UI_DIR = tmp
-RCC_DIR = tmp
-DESTDIR = ../bin
-
 HEADERS += curve.h \
            geometry.h \
            imagemanager.h \