diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-06-20 15:06:46 +0200 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-06-21 11:49:30 +0000 |
commit | 493d8e821b2d8f8a9f14f4f5f48671887a9eef84 (patch) | |
tree | 098855424e405c043d9088af9f6a65a75a0f5dcb /sources/pyside2/libpyside/pyside.cpp | |
parent | 20de0a3b512b040097cadeda9fdb9bfb8245117c (diff) |
Remove QT_LOGGING_RULES to fix QLibraryPath paths
QT_LOGGING_RULES was internally overwriting the
PySide2 QLibraryPath configuration, so all the paths
were incorrect.
Please follow PYSIDE-717 for a discussion on an
alternative to have a proper solution.
Task-number: PYSIDE-694
Change-Id: I551d7876a416ac31fcff70d843a28c98dfa5ed08
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/libpyside/pyside.cpp')
-rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index 15be38760..cb6f0721f 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -442,11 +442,6 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x16,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0 }; -// Note that setting QT_LOGGING_RULES for categories used before QCoreApplication is instantiated, -// will only work on Qt 5.9.4+. On lower versions, it will appear that setting QT_LOGGING_RULES -// does not affect lcPysideQtConf in any way. -Q_LOGGING_CATEGORY(lcPySide2, "pyside2", QtWarningMsg) - bool registerInternalQtConf() { // Guard to ensure single registration. @@ -454,8 +449,6 @@ bool registerInternalQtConf() static bool registrationAttempted = false; #else static bool registrationAttempted = true; - qCDebug(lcPySide2) << "PySide2 was built without qt.conf modification support. " - "No special qt.conf behavior will be applied."; #endif static bool isRegistered = false; if (registrationAttempted) @@ -482,10 +475,6 @@ bool registerInternalQtConf() QString maybeQtConfPath = QDir(appDirPath).filePath(QStringLiteral("qt.conf")); bool executableQtConfAvailable = QFileInfo::exists(maybeQtConfPath); maybeQtConfPath = QDir::toNativeSeparators(maybeQtConfPath); - if (!executableQtConfAvailable) { - qCDebug(lcPySide2) << "No qt.conf found near executable at: " << maybeQtConfPath - << "\nTrying next candidates."; - } // Allow disabling the usage of the internal qt.conf. This is necessary for tests to work, // because tests are executed before the package is installed, and thus the Prefix specified @@ -493,10 +482,6 @@ bool registerInternalQtConf() bool disableInternalQtConf = qEnvironmentVariableIntValue("PYSIDE_DISABLE_INTERNAL_QT_CONF") > 0 ? true : false; if (disableInternalQtConf || executableQtConfAvailable) { - if (executableQtConfAvailable) - qCDebug(lcPySide2) << "Using qt.conf found near executable at: " << maybeQtConfPath; - if (disableInternalQtConf) - qCDebug(lcPySide2) << "Internal qt.conf usage disabled via environment variable."; registrationAttempted = true; return false; } @@ -553,9 +538,6 @@ bool registerInternalQtConf() reinterpret_cast<const unsigned char *>( rccData.constData())); - if (isRegistered) - qCDebug(lcPySide2) << "Using internal qt.conf with prefix pointing to: " << prefixPath; - return isRegistered; } |