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

QmlDebugging: Enable linking the library automatically for debug builds

Browse Source 
Change-Id: I31c6ce649ec5a106ac8d5a556659a26f584b1d09
Reviewed-by: dt
This commit is contained in:
Kai Koehne
2011-05-13 17:41:02 +02:00
parent 6a55021285
commit a7426ca709
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -66,13 +66,14 @@ const char * const QMAKE_BS_ID("QtProjectManager.QMakeBuildStep");
const char * const QMAKE_ARGUMENTS_KEY("QtProjectManager.QMakeBuildStep.QMakeArguments"); const char * const QMAKE_ARGUMENTS_KEY("QtProjectManager.QMakeBuildStep.QMakeArguments");
const char * const QMAKE_FORCED_KEY("QtProjectManager.QMakeBuildStep.QMakeForced"); const char * const QMAKE_FORCED_KEY("QtProjectManager.QMakeBuildStep.QMakeForced");
const char * const QMAKE_QMLDEBUGLIBAUTO_KEY("QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto");
const char * const QMAKE_QMLDEBUGLIB_KEY("QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary"); const char * const QMAKE_QMLDEBUGLIB_KEY("QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary");
} }
QMakeStep::QMakeStep(BuildStepList *bsl) : QMakeStep::QMakeStep(BuildStepList *bsl) :
AbstractProcessStep(bsl, QLatin1String(QMAKE_BS_ID)), AbstractProcessStep(bsl, QLatin1String(QMAKE_BS_ID)),
m_forced(false), m_forced(false),
m_linkQmlDebuggingLibrary(false) m_linkQmlDebuggingLibrary(DebugLink)
{ {
ctor(); ctor();
} }
@@ -80,7 +81,7 @@ QMakeStep::QMakeStep(BuildStepList *bsl) :
QMakeStep::QMakeStep(BuildStepList *bsl, const QString &id) : QMakeStep::QMakeStep(BuildStepList *bsl, const QString &id) :
AbstractProcessStep(bsl, id), AbstractProcessStep(bsl, id),
m_forced(false), m_forced(false),
m_linkQmlDebuggingLibrary(false) m_linkQmlDebuggingLibrary(DebugLink)
{ {
ctor(); ctor();
} }
@@ -173,7 +174,7 @@ QStringList QMakeStep::moreArguments()
arguments << QLatin1String("-unix"); arguments << QLatin1String("-unix");
#endif #endif
if (m_linkQmlDebuggingLibrary && bc->qtVersion()) { if (linkQmlDebuggingLibrary() && bc->qtVersion()) {
if (!bc->qtVersion()->needsQmlDebuggingLibrary()) { if (!bc->qtVersion()->needsQmlDebuggingLibrary()) {
// This Qt version has the QML debugging services built in, however // This Qt version has the QML debugging services built in, however
// they still need to be enabled at compile time // they still need to be enabled at compile time
@@ -391,14 +392,19 @@ bool QMakeStep::isQmlDebuggingLibrarySupported(QString *reason) const
bool QMakeStep::linkQmlDebuggingLibrary() const bool QMakeStep::linkQmlDebuggingLibrary() const
{ {
return m_linkQmlDebuggingLibrary; if (m_linkQmlDebuggingLibrary == DoLink)
return true;
if (m_linkQmlDebuggingLibrary == DoNotLink)
return false;
return (qt4BuildConfiguration()->buildType() & BuildConfiguration::Debug);
} }
void QMakeStep::setLinkQmlDebuggingLibrary(bool enable) void QMakeStep::setLinkQmlDebuggingLibrary(bool enable)
{ {
if (m_linkQmlDebuggingLibrary == enable) if ((enable && (m_linkQmlDebuggingLibrary == DoLink))
|| (!enable && (m_linkQmlDebuggingLibrary == DoNotLink)))
return; return;
m_linkQmlDebuggingLibrary = enable; m_linkQmlDebuggingLibrary = enable ? DoLink : DoNotLink;
emit linkQmlDebuggingLibraryChanged(); emit linkQmlDebuggingLibraryChanged();
@@ -424,7 +430,8 @@ QVariantMap QMakeStep::toMap() const
{ {
QVariantMap map(AbstractProcessStep::toMap()); QVariantMap map(AbstractProcessStep::toMap());
map.insert(QLatin1String(QMAKE_ARGUMENTS_KEY), m_userArgs); map.insert(QLatin1String(QMAKE_ARGUMENTS_KEY), m_userArgs);
map.insert(QLatin1String(QMAKE_QMLDEBUGLIB_KEY), m_linkQmlDebuggingLibrary); map.insert(QLatin1String(QMAKE_QMLDEBUGLIBAUTO_KEY), m_linkQmlDebuggingLibrary == DebugLink);
map.insert(QLatin1String(QMAKE_QMLDEBUGLIB_KEY), m_linkQmlDebuggingLibrary == DoLink);
map.insert(QLatin1String(QMAKE_FORCED_KEY), m_forced); map.insert(QLatin1String(QMAKE_FORCED_KEY), m_forced);
return map; return map;
} }
@@ -433,7 +440,16 @@ bool QMakeStep::fromMap(const QVariantMap &map)
{ {
m_userArgs = map.value(QLatin1String(QMAKE_ARGUMENTS_KEY)).toString(); m_userArgs = map.value(QLatin1String(QMAKE_ARGUMENTS_KEY)).toString();
m_forced = map.value(QLatin1String(QMAKE_FORCED_KEY), false).toBool(); m_forced = map.value(QLatin1String(QMAKE_FORCED_KEY), false).toBool();
m_linkQmlDebuggingLibrary = map.value(QLatin1String(QMAKE_QMLDEBUGLIB_KEY), false).toBool(); if (map.value(QLatin1String(QMAKE_QMLDEBUGLIBAUTO_KEY), false).toBool()) {
m_linkQmlDebuggingLibrary = DebugLink;
} else {
if (map.value(QLatin1String(QMAKE_QMLDEBUGLIB_KEY), false).toBool()) {
m_linkQmlDebuggingLibrary = DoLink;
} else {
m_linkQmlDebuggingLibrary = DoNotLink;
}
}
return BuildStep::fromMap(map); return BuildStep::fromMap(map);
} }

8
src/plugins/qt4projectmanager/qmakestep.h
View File

@@ -76,6 +76,12 @@ class QMakeStep : public ProjectExplorer::AbstractProcessStep
Q_OBJECT Q_OBJECT
friend class Internal::QMakeStepFactory; friend class Internal::QMakeStepFactory;
enum QmlLibraryLink {
DoNotLink = 0,
DoLink,
DebugLink
};
public: public:
explicit QMakeStep(ProjectExplorer::BuildStepList *parent); explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
virtual ~QMakeStep(); virtual ~QMakeStep();
@@ -120,7 +126,7 @@ private:
bool m_forced; bool m_forced;
bool m_needToRunQMake; // set in init(), read in run() bool m_needToRunQMake; // set in init(), read in run()
QString m_userArgs; QString m_userArgs;
bool m_linkQmlDebuggingLibrary; QmlLibraryLink m_linkQmlDebuggingLibrary;
bool m_scriptTemplate; bool m_scriptTemplate;
QList<ProjectExplorer::Task> m_tasks; QList<ProjectExplorer::Task> m_tasks;
}; };