Fix typo
Change-Id: If6111c59b958ba03f6ec5966af5cf443cae5cf9b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
parent
27aacfb61e
commit
27c840f5d4
@ -255,7 +255,7 @@ void QLoggingSettingsParser::parseNextLine(QStringRef line)
|
|||||||
QLoggingRegistry::QLoggingRegistry()
|
QLoggingRegistry::QLoggingRegistry()
|
||||||
: categoryFilter(defaultCategoryFilter)
|
: categoryFilter(defaultCategoryFilter)
|
||||||
{
|
{
|
||||||
initalizeRules(); // Init on first use
|
initializeRules(); // Init on first use
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool qtLoggingDebug()
|
static bool qtLoggingDebug()
|
||||||
@ -284,7 +284,7 @@ static QVector<QLoggingRule> loadRulesFromFile(const QString &filePath)
|
|||||||
Initializes the rules database by loading
|
Initializes the rules database by loading
|
||||||
$QT_LOGGING_CONF, $QT_LOGGING_RULES, and .config/QtProject/qtlogging.ini.
|
$QT_LOGGING_CONF, $QT_LOGGING_RULES, and .config/QtProject/qtlogging.ini.
|
||||||
*/
|
*/
|
||||||
void QLoggingRegistry::initalizeRules()
|
void QLoggingRegistry::initializeRules()
|
||||||
{
|
{
|
||||||
QVector<QLoggingRule> er, qr, cr;
|
QVector<QLoggingRule> er, qr, cr;
|
||||||
// get rules from environment
|
// get rules from environment
|
||||||
|
@ -113,7 +113,7 @@ class Q_AUTOTEST_EXPORT QLoggingRegistry
|
|||||||
public:
|
public:
|
||||||
QLoggingRegistry();
|
QLoggingRegistry();
|
||||||
|
|
||||||
void initalizeRules();
|
void initializeRules();
|
||||||
|
|
||||||
void registerCategory(QLoggingCategory *category, QtMsgType enableForLevel);
|
void registerCategory(QLoggingCategory *category, QtMsgType enableForLevel);
|
||||||
void unregisterCategory(QLoggingCategory *category);
|
void unregisterCategory(QLoggingCategory *category);
|
||||||
|
@ -212,7 +212,7 @@ private slots:
|
|||||||
|
|
||||||
qunsetenv("QT_LOGGING_RULES");
|
qunsetenv("QT_LOGGING_RULES");
|
||||||
qputenv("QT_LOGGING_CONF", QFINDTESTDATA("qtlogging.ini").toLocal8Bit());
|
qputenv("QT_LOGGING_CONF", QFINDTESTDATA("qtlogging.ini").toLocal8Bit());
|
||||||
registry.initalizeRules();
|
registry.initializeRules();
|
||||||
|
|
||||||
QCOMPARE(registry.ruleSets[QLoggingRegistry::ApiRules].size(), 0);
|
QCOMPARE(registry.ruleSets[QLoggingRegistry::ApiRules].size(), 0);
|
||||||
QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 0);
|
QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 0);
|
||||||
@ -220,7 +220,7 @@ private slots:
|
|||||||
|
|
||||||
// check that QT_LOGGING_RULES take precedence
|
// check that QT_LOGGING_RULES take precedence
|
||||||
qputenv("QT_LOGGING_RULES", "Digia.*=true");
|
qputenv("QT_LOGGING_RULES", "Digia.*=true");
|
||||||
registry.initalizeRules();
|
registry.initializeRules();
|
||||||
QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].size(), 2);
|
QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].size(), 2);
|
||||||
QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].at(1).enabled, true);
|
QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].at(1).enabled, true);
|
||||||
}
|
}
|
||||||
@ -246,7 +246,7 @@ private slots:
|
|||||||
file.close();
|
file.close();
|
||||||
|
|
||||||
QLoggingRegistry registry;
|
QLoggingRegistry registry;
|
||||||
registry.initalizeRules();
|
registry.initializeRules();
|
||||||
QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1);
|
QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1);
|
||||||
|
|
||||||
// remove file again
|
// remove file again
|
||||||
|
Loading…
x
Reference in New Issue
Block a user