From dd57141184770680c7436bc97856eb9db47f7fa9 Mon Sep 17 00:00:00 2001 From: Philip Graham Willoughby Date: Sun, 11 Jan 2015 16:25:24 +0000 Subject: [PATCH 1/2] Changes to build on OS X with spaces in path --- qwt/src/src.pro | 2 +- src/application.qrc | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/qwt/src/src.pro b/qwt/src/src.pro index dcac61239..440a48bd3 100644 --- a/qwt/src/src.pro +++ b/qwt/src/src.pro @@ -17,7 +17,7 @@ include( $${QWT_ROOT}/qwtfunctions.pri ) TEMPLATE = lib TARGET = $$qwtLibraryTarget(qwt) -DESTDIR = $${OUT_PWD}/../lib +DESTDIR = $$replace($${OUT_PWD}/../lib," ","\\ ") contains(QWT_CONFIG, QwtDll) { diff --git a/src/application.qrc b/src/application.qrc index af0f18bf6..d0b767246 100644 --- a/src/application.qrc +++ b/src/application.qrc @@ -75,15 +75,6 @@ images/settings.png images/addchart.png images/library.png - translations/gc_fr.qm - translations/gc_ja.qm - translations/gc_it.qm - translations/gc_pt-br.qm - translations/gc_de.qm - translations/gc_ru.qm - translations/gc_cs.qm - translations/gc_es.qm - translations/gc_pt.qm xml/charts.xml xml/metadata.xml xml/train-layout.xml From fbffd1b467c73349d006fb780aa9487c54d0ec82 Mon Sep 17 00:00:00 2001 From: Philip Graham Willoughby Date: Sun, 11 Jan 2015 16:37:51 +0000 Subject: [PATCH 2/2] Revert erroneous translation deletion This partially reverts commit dd57141184770680c7436bc97856eb9db47f7fa9. --- src/application.qrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/application.qrc b/src/application.qrc index d0b767246..af0f18bf6 100644 --- a/src/application.qrc +++ b/src/application.qrc @@ -75,6 +75,15 @@ images/settings.png images/addchart.png images/library.png + translations/gc_fr.qm + translations/gc_ja.qm + translations/gc_it.qm + translations/gc_pt-br.qm + translations/gc_de.qm + translations/gc_ru.qm + translations/gc_cs.qm + translations/gc_es.qm + translations/gc_pt.qm xml/charts.xml xml/metadata.xml xml/train-layout.xml