diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
| commit | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (patch) | |
| tree | dd3b49b40ed01cad1c2cdc206ec73271bca6e942 /tools | |
| parent | 94e337fa95425d259e81b4d21f4d0853108553bd (diff) | |
| parent | 668ccf18dc8d5ddf403667f19a5b08f2b7c18639 (diff) | |
Merge dev into 5.6
Change-Id: I9ec05838f3c4cbc11fb969c71daf5c2a5a8df360
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 6 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
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<QWindow *>(sender())); 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); |