Imported Upstream version 3.1.0upstream/3.1.0

11 files changed, 27 insertions, 19 deletions

diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro
index d888a32..86fa734 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl.pro
+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro
@@ -81,19 +81,27 @@ linux: {
 
 macx: {
     # Find tclsh
-    TCLSH = $$system(echo "puts 1" | tclsh)
-    !contains(TCLSH, 1): {
-        error("Could not find tclsh executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers. Make tclsh available in PATH.")
-    }
-    TCLSH = $$system(which tclsh)
+    #TCLSH = $$system(echo "puts 1" | tclsh)
+    #!contains(TCLSH, 1): {
+    #    error("Could not find tclsh executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers. Make tclsh available in PATH.")
+    #}
+    #TCLSH = $$system(which tclsh)
 
     # Find its version
-    TCL_VERSION = $$system(echo "puts [info tclversion]" | tclsh)
+    #TCL_VERSION = $$system(echo "puts [info tclversion]" | tclsh)
     #message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)")
 
     # Find tclConfig.sh
-    TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh)
-    TCL_CONFIG = $$TCL_CONFIG_DIR/../../tclConfig.sh
+    #TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh)
+    #TCL_CONFIG = $$TCL_CONFIG_DIR/../../tclConfig.sh
+
+    XCRUN = $$system(xcrun --version)
+    !contains(XCRUN, xcrun): {
+        error("Could not find xcrun executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers.")
+    }
+
+    SDK_PATH = $$system(xcrun --show-sdk-path)
+    TCL_CONFIG = $$SDK_PATH/System/Library/Frameworks/Tcl.framework/Versions/Current/tclConfig.sh
 
     # Define other libs required when linking with Tcl
     eval($$system(cat $$TCL_CONFIG | grep TCL_LIBS))
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_de.ts b/Plugins/ScriptingTcl/ScriptingTcl_de.ts
index cbd7c60..adb7f21 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_de.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_es.ts b/Plugins/ScriptingTcl/ScriptingTcl_es.ts
index f2eaa40..502c856 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_es.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<TS version="2.0" language="es_ES">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_fr.ts b/Plugins/ScriptingTcl/ScriptingTcl_fr.ts
index aab5121..be33fe6 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_fr.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_fr.ts
@@ -6,17 +6,17 @@
     <message>
         <location filename="scriptingtcl.cpp" line="411"/>
         <source>No database available in current context, while called Tcl&apos;s &apos;%1&apos; command.</source>
-        <translation>Aucune base de données valide dans le contexte courant, appeler la commande Tcl&apos;s &apos;%1&apos;.</translation>
+        <translation>Aucune base de données valide dans le contexte courant, appeler la commande Tcl&rsquo;s «&nbsp;%1&nbsp;».</translation>
     </message>
     <message>
         <location filename="scriptingtcl.cpp" line="433"/>
         <source>Invalid &apos;%1&apos; command sytax. Should be: %2</source>
-        <translation>Syntaxe de commande invalide &apos;%1&apos;. Devrait être: %2</translation>
+        <translation>Syntaxe de commande invalide «&nbsp;%1&nbsp;». Devrait être: %2</translation>
     </message>
     <message>
         <location filename="scriptingtcl.cpp" line="554"/>
         <source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
-        <translation>Erreur de la commande Tcl &apos;%1&apos;: %2</translation>
+        <translation>Erreur de la commande Tcl «&nbsp;%1&nbsp;»: %2</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_it.qm b/Plugins/ScriptingTcl/ScriptingTcl_it.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/ScriptingTcl/ScriptingTcl_it.qm
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_it.ts b/Plugins/ScriptingTcl/ScriptingTcl_it.ts
index dc735d6..9b252cc 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_it.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="it_IT">
+<TS version="2.0" language="it_IT">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_pl.ts b/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
index acbf1c9..be6a580 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pl_PL">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts b/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts
index 8eea04b..a0ffcb8 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pt_BR">
+<TS version="2.0" language="pt_BR">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_ru.ts b/Plugins/ScriptingTcl/ScriptingTcl_ru.ts
index 9514a37..4fd66de 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_ru.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_sk.ts b/Plugins/ScriptingTcl/ScriptingTcl_sk.ts
index fa64a4a..ec050a9 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_sk.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="sk_SK">
+<TS version="2.0" language="sk_SK">
 <context>
     <name>ScriptingTcl</name>
     <message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts b/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts
index d213109..0355116 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>ScriptingTcl</name>
     <message>