From fbdc01f141a4ec4e6fc78ea69d86ff7aa128bf72 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 5 Aug 2015 17:27:08 +0200 Subject: Allow specification of loadable debug services via command line We don't want to load the debugger when profiling and vice versa. This makes it easier to prevent unwanted services from getting loaded. Task-number: QTBUG-47623 Change-Id: I28893b6218110274a6d30b27805d89dbb443add3 Reviewed-by: Erik Verbruggen --- tools/qmlprofiler/qmlprofilerapplication.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp index 188373ccc6..1eab1a0a8c 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.cpp +++ b/tools/qmlprofiler/qmlprofilerapplication.cpp @@ -476,7 +476,8 @@ void QmlProfilerApplication::run() if (m_runMode == LaunchMode) { m_process = new QProcess(this); QStringList arguments; - arguments << QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(m_port); + arguments << QString::fromLatin1("-qmljsdebugger=port:%1,block,services:CanvasFrameRate") + .arg(m_port); arguments << m_programArguments; m_process->setProcessChannelMode(QProcess::MergedChannels); -- cgit v1.2.3 From 668ccf18dc8d5ddf403667f19a5b08f2b7c18639 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 28 Jul 2015 12:41:46 +0000 Subject: qml: Don't build OpenGL support if OpenGL is not available in Qt. Change-Id: I66c841778eb0ae662c3951a26665c83e233851b5 Reviewed-by: Gunnar Sletta --- tools/qml/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 206788c061..c2718de240 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -209,7 +209,7 @@ public Q_SLOTS: //Will be checked before calling exec() earlyExit = true; } -#ifdef QT_GUI_LIB +#if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL) void onOpenGlContextCreated(QOpenGLContext *context); #endif }; @@ -231,7 +231,7 @@ void LoadWatcher::contain(QObject *o, const QUrl &containPath) void LoadWatcher::checkForWindow(QObject *o) { -#ifdef QT_GUI_LIB +#if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL) if (verboseMode && o->isWindowType() && o->inherits("QQuickWindow")) { connect(o, SIGNAL(openglContextCreated(QOpenGLContext*)), this, SLOT(onOpenGlContextCreated(QOpenGLContext*))); @@ -241,7 +241,7 @@ void LoadWatcher::checkForWindow(QObject *o) #endif // QT_GUI_LIB } -#ifdef QT_GUI_LIB +#if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL) void LoadWatcher::onOpenGlContextCreated(QOpenGLContext *context) { context->makeCurrent(qobject_cast(sender())); -- cgit v1.2.3