Browse Source

Fix previous commit for old qt versions

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 6 years ago
parent
commit
c75b836f2e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 8 additions and 6 deletions
  1. +5
    -3
      source/frontend/carla_app.py
  2. +1
    -1
      source/frontend/carla_host.py
  3. +2
    -2
      source/frontend/carla_shared.py

+ 5
- 3
source/frontend/carla_app.py View File

@@ -19,7 +19,7 @@
# ------------------------------------------------------------------------------------------------------------
# Imports (Global)

from PyQt5.QtCore import Qt, QCoreApplication, QSettings
from PyQt5.QtCore import QT_VERSION, Qt, QCoreApplication, QSettings
from PyQt5.QtGui import QColor, QPalette
from PyQt5.QtWidgets import QApplication

@@ -223,10 +223,12 @@ class CarlaApplication(object):
return

if appName.lower() == "carla-control":
self.fApp.setDesktopFileName("carla-control")
if QT_VERSION >= 0x50700:
self.fApp.setDesktopFileName("carla-control")
self.fApp.setWindowIcon(QIcon(":/scalable/carla-control.svg"))
else:
self.fApp.setDesktopFileName("carla")
if QT_VERSION >= 0x50700:
self.fApp.setDesktopFileName("carla")
self.fApp.setWindowIcon(QIcon(":/scalable/carla.svg"))

def exec_(self):


+ 1
- 1
source/frontend/carla_host.py View File

@@ -2785,7 +2785,7 @@ def initHost(initName, libPrefix, isControl, isPlugin, failError, HostClass = No

print("Carla %s started, status:" % VERSION)
print(" Python version: %s" % sys.version.split(" ",1)[0])
print(" Qt version: %s" % qVersion())
print(" Qt version: %s" % QT_VERSION_STR)
print(" PyQt version: %s" % PYQT_VERSION_STR)
print(" Binary dir: %s" % pathBinaries)
print(" Resources dir: %s" % pathResources)


+ 2
- 2
source/frontend/carla_shared.py View File

@@ -30,7 +30,7 @@ import os
import sys

from PyQt5.Qt import PYQT_VERSION_STR
from PyQt5.QtCore import qFatal, qVersion, qWarning, QDir
from PyQt5.QtCore import qFatal, QT_VERSION_STR, qWarning, QDir
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QFileDialog, QMessageBox

@@ -626,7 +626,7 @@ def handleInitialCommandLineArguments(file):

print("Using Carla version %s" % VERSION)
print(" Python version: %s" % sys.version.split(" ",1)[0])
print(" Qt version: %s" % qVersion())
print(" Qt version: %s" % QT_VERSION_STR)
print(" PyQt version: %s" % PYQT_VERSION_STR)
print(" Binary dir: %s" % pathBinaries)
print(" Resources dir: %s" % pathResources)


Loading…
Cancel
Save