Merge branch 'OSX_fix'

Conflicts: data/translations/knotter_cs.ts data/translations/knotter_en_GB.ts data/translations/knotter_it.ts data/translations/knotter_ru.ts man/knotter.1.gz
mbasaglia · Nov 19, 2013 · 8114c05 · 8114c05
2 parents 7f452be + 5efb9a4
commit 8114c05
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/knotter.pro b/knotter.pro
@@ -13,6 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Workaround a bug in OSX Qt5
+macx {
+    cache()
+}
+
 # Base configutation
 QT += core gui xml script svg network
 
@@ -26,8 +31,11 @@ OBJECTS_DIR = obj
 include(knotter_info.pri)
 include(src/src.pri)
 include(translations.pri)
-include(data/plugins/plugins.pri)
 
+#include for lupdate but discard on compilation
+!debug:!release {
+    include(data/plugins/plugins.pri)
+}
 
 #non-source files
 OTHER_FILES = \

diff --git a/man/knotter.1.gz b/man/knotter.1.gz
diff --git a/package/qt-4.7/port-back.sh b/package/qt-4.7/port-back.sh
@@ -19,7 +19,7 @@ mkdir src/ui
 mv src/generated/ui_*.h src/ui
 rmdir src/generated obj
 
-find -name '*.ui' -delete
+find -name '*.ui' -path './src/*' -delete
 
 cd src/ui