diff -r 50c9c1c9cf30 -r adb59475e671 Plugins/PluginEricdoc.py
--- a/Plugins/PluginEricdoc.py Sun Jan 20 14:41:07 2019 +0100
+++ b/Plugins/PluginEricdoc.py Sun Jan 20 19:38:51 2019 +0100
@@ -18,6 +18,7 @@
from E5Gui.E5Action import E5Action
+from Globals import qVersionTuple
import Utilities
import UI.Info
@@ -87,21 +88,22 @@
"versionCleanup": (0, -1),
})
- # 3. Qt Collection Generator
- exe = os.path.join(Utilities.getQtBinariesPath(), 'qcollectiongenerator')
- if Utilities.isWindowsPlatform():
- exe += '.exe'
- dataList.append({
- "programEntry": True,
- "header": QCoreApplication.translate(
- "EricdocPlugin", "Qt Help Tools"),
- "exe": exe,
- "versionCommand": '-v',
- "versionStartsWith": 'Qt',
- "versionPosition": -1,
- "version": "",
- "versionCleanup": (0, -1),
- })
+ if qVersionTuple() < (5, 12, 0):
+ # 3. Qt Collection Generator
+ exe = os.path.join(Utilities.getQtBinariesPath(), 'qcollectiongenerator')
+ if Utilities.isWindowsPlatform():
+ exe += '.exe'
+ dataList.append({
+ "programEntry": True,
+ "header": QCoreApplication.translate(
+ "EricdocPlugin", "Qt Help Tools"),
+ "exe": exe,
+ "versionCommand": '-v',
+ "versionStartsWith": 'Qt',
+ "versionPosition": -1,
+ "version": "",
+ "versionCleanup": (0, -1),
+ })
return dataList
