feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CodeModel(s): Unify name/values of accessed environment variables

Browse Source 
Format: QTC_*=(1|0).

Now it's easier to change them in the Run Configuration of Qt Creator.

Change-Id: Ifc45cecb89b33a31942b4c3e2d03851a1d72d0bf
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-03-06 14:42:01 -03:00
parent 311868a696
commit 0d84603c41
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangcompletion.cpp
View File

@@ -60,7 +60,7 @@
#include <QTextCursor> #include <QTextCursor>
#include <QTextDocument> #include <QTextDocument>
static const bool DebugTiming = !qgetenv("QTC_CLANG_VERBOSE").isEmpty(); static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1";
using namespace ClangCodeModel; using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal; using namespace ClangCodeModel::Internal;

2
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -45,7 +45,7 @@ using namespace ClangCodeModel::Internal;
using namespace Core; using namespace Core;
using namespace CppTools; using namespace CppTools;
static const bool BeVerbose = !qgetenv("QTC_CLANG_VERBOSE").isEmpty(); static const bool BeVerbose = qgetenv("QTC_CLANG_VERBOSE") == "1";
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Utils { namespace Utils {

2
src/plugins/clangcodemodel/cppcreatemarkers.cpp
View File

@@ -41,7 +41,7 @@
#include <QDebug> #include <QDebug>
static const bool DebugTiming = !qgetenv("QTC_CLANG_VERBOSE").isEmpty(); static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1";
using namespace ClangCodeModel; using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal; using namespace ClangCodeModel::Internal;

2
src/plugins/clangcodemodel/unit.cpp
View File

@@ -47,7 +47,7 @@ static QBasicAtomicInt unitDataCount = Q_BASIC_ATOMIC_INITIALIZER(0);
using namespace ClangCodeModel; using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal; using namespace ClangCodeModel::Internal;
static const int DisplayDiagnostics = qgetenv("QTC_CLANG_VERBOSE").isEmpty() ? 0 : 1; static const int DisplayDiagnostics = (qgetenv("QTC_CLANG_VERBOSE") == "1") ? 1 : 0;
Unit::Unit() Unit::Unit()
: m_index(0) : m_index(0)

4
src/plugins/cpptools/builtinindexingsupport.cpp
View File

@@ -16,6 +16,8 @@
using namespace CppTools; using namespace CppTools;
using namespace CppTools::Internal; using namespace CppTools::Internal;
static const bool DumpFileNameWhileParsing = qgetenv("QTC_DUMP_FILENAME_WHILE_PARSING") == "1";
namespace { namespace {
static void parse(QFutureInterface<void> &future, static void parse(QFutureInterface<void> &future,
@@ -171,7 +173,7 @@ BuiltinIndexingSupport::BuiltinIndexingSupport()
: m_revision(0) : m_revision(0)
{ {
m_synchronizer.setCancelOnWait(true); m_synchronizer.setCancelOnWait(true);
m_dumpFileNameWhileParsing = !qgetenv("QTCREATOR_DUMP_FILENAME_WHILE_PARSING").isNull(); m_dumpFileNameWhileParsing = DumpFileNameWhileParsing;
} }
BuiltinIndexingSupport::~BuiltinIndexingSupport() BuiltinIndexingSupport::~BuiltinIndexingSupport()

6
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -60,6 +60,8 @@
#include <sstream> #include <sstream>
#endif #endif
static const bool DumpProjectInfo = qgetenv("QTC_DUMP_PROJECT_INFO") == "1";
namespace CppTools { namespace CppTools {
uint qHash(const ProjectPart &p) uint qHash(const ProjectPart &p)
@@ -245,7 +247,7 @@ CppModelManager::CppModelManager(QObject *parent)
this, SIGNAL(globalSnapshotChanged())); this, SIGNAL(globalSnapshotChanged()));
m_findReferences = new CppFindReferences(this); m_findReferences = new CppFindReferences(this);
m_indexerEnabled = qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull(); m_indexerEnabled = qgetenv("QTC_NO_CODE_INDEXER") != "1";
m_dirty = true; m_dirty = true;
@@ -782,7 +784,7 @@ QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo &newProjectIn
} // Mutex scope } // Mutex scope
// If requested, dump everything we got // If requested, dump everything we got
if (!qgetenv("QTCREATOR_DUMP_PROJECT_INFO").isEmpty()) if (DumpProjectInfo)
dumpModelManagerConfiguration(); dumpModelManagerConfiguration();
// Remove files from snapshot that are not reachable any more // Remove files from snapshot that are not reachable any more