Merged develop into feature

--HG--
branch : feature

src/app/tape/tape.pro

@@ -200,7 +200,17 @@ unix{
         # Some macx stuff
         QMAKE_MAC_SDK = macosx
 
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+        # Check which minimal OSX version supports current Qt version
+        equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {
+            QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+        } else {
+            equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {
+                QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+            } else {
+                QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+            }
+        }
+
         # Path to resources in app bundle
         #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
         FRAMEWORKS_DIR = "Contents/Frameworks"

src/app/tape/tmainwindow.cpp

@@ -462,6 +462,13 @@ void TMainWindow::CreateFromExisting()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::Preferences()
+{
+    TapeConfigDialog dlg(this);
+    dlg.exec();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::closeEvent(QCloseEvent *event)
 {
@@ -1734,11 +1741,7 @@ void TMainWindow::SetupMenu()
 
     connect(ui->actionExportToCSV, &QAction::triggered, this, &TMainWindow::ExportToCSV);
     connect(ui->actionReadOnly, &QAction::triggered, this, &TMainWindow::ReadOnly);
-    connect(ui->actionPreferences, &QAction::triggered, [this]()
-    {
-        TapeConfigDialog dlg(this);
-        dlg.exec();
-    });
+    connect(ui->actionPreferences, &QAction::triggered, this, &TMainWindow::Preferences);
 
     for (int i = 0; i < MaxRecentFiles; ++i)
     {

src/app/tape/tmainwindow.h

@@ -75,6 +75,7 @@ private slots:
     void OpenStandard();
     void OpenTemplate();
     void CreateFromExisting();
+    void Preferences();
 
     void FileSave();
     void FileSaveAs();

src/app/valentina/mainwindow.cpp

@@ -3553,18 +3553,7 @@ void MainWindow::CreateActions()
 
     connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
 
-    connect(ui->actionPreferences, &QAction::triggered, [this]()
-    {
-        ConfigDialog dlg(this);
-        connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::WindowsLocale); // Must be first
-        connect(&dlg, &ConfigDialog::UpdateProperties, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions);
-        connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::ToolBarStyles);
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            InitAutoSave();
-        }
-    });
-
+    connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences);
     connect(ui->actionReportBug, &QAction::triggered, [this]()
     {
         qCDebug(vMainWindow, "Reporting bug");
@@ -3954,6 +3943,27 @@ void MainWindow::ShowPaper(int index)
     ui->view->fitInView(ui->view->scene()->sceneRect(), Qt::KeepAspectRatio);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::Preferences()
+{
+    ConfigDialog dlg(this);
+    connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::WindowsLocale); // Must be first
+    connect(&dlg, &ConfigDialog::UpdateProperties, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions);
+    connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::ToolBarStyles);
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        InitAutoSave();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::CreateMeasurements()
+{
+    const QString tape = qApp->TapeFilePath();
+    const QString workingDirectory = QFileInfo(tape).absoluteDir().absolutePath();
+    QProcess::startDetached(tape, QStringList(), workingDirectory);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void MainWindow::ToolBarStyle(QToolBar *bar)
 {

src/app/valentina/mainwindow.h

@@ -111,6 +111,8 @@ private slots:
     void WindowsLocale();
     void ToolBarStyles();
     void ShowPaper(int index);
+    void Preferences();
+    void CreateMeasurements();
 
     void ArrowTool();
     void ToolEndLine(bool checked);

src/app/valentina/valentina.pro

@@ -214,7 +214,17 @@ unix{
         # Some macx stuff
         QMAKE_MAC_SDK = macosx
 
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+        # Check which minimal OSX version supports current Qt version
+        equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {
+            QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+        } else {
+            equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {
+                QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+            } else {
+                QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+            }
+        }
+
         # Path to resources in app bundle
         #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
         FRAMEWORKS_DIR = "Contents/Frameworks"

src/libs/qmuparser/qmuparser.pro

@@ -41,6 +41,9 @@ include(qmuparser.pri)
 
 VERSION = 2.4.1
 
+# Allow MAC OS X to find library inside a bundle
+macx:QMAKE_SONAME_PREFIX = @rpath
+
 # Set "make install" command for Unix-like systems.
 unix:!macx{
     isEmpty(PREFIX_LIB){

src/libs/vpropertyexplorer/vpropertyexplorer.pro

@@ -37,6 +37,9 @@ MOC_DIR = moc
 # objecs files
 OBJECTS_DIR = obj
 
+# Allow MAC OS X to find library inside a bundle
+macx:QMAKE_SONAME_PREFIX = @rpath
+
 include(vpropertyexplorer.pri)
 
 # Set "make install" command for Unix-like systems.