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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: I37bb3dcc54d49250a5d45d8dd35484dc3b5fa89f
This commit is contained in:
Eike Ziller
2015-07-01 14:15:34 +02:00
parent abde4163c7 1cad9ae88c
commit cc5fe6a00e
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/qmlprofilerextension/qmlprofilerextension.qbs
View File

@@ -1,10 +1,9 @@
import qbs import qbs
QtcPlugin { QtcCommercialPlugin {
name: "QmlProfilerExtension" name: "QmlProfilerExtension"
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "LicenseChecker" }
Depends { name: "QmlProfiler" } Depends { name: "QmlProfiler" }
Depends { name: "Timeline" } Depends { name: "Timeline" }

5
plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
View File

@@ -1,4 +1,5 @@
QTC_PLUGIN_NAME = QmlProfilerExtension QTC_PLUGIN_NAME = QmlProfilerExtension
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
qmlprofiler \ qmlprofiler
licensechecker \
CONFIG(licensechecker): QT_PLUGIN_DEPENDS += licensechecker

6
plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
View File

@@ -20,7 +20,9 @@
#include "qmlprofilerextensionconstants.h" #include "qmlprofilerextensionconstants.h"
#include <qmlprofiler/qmlprofilertimelinemodelfactory.h> #include <qmlprofiler/qmlprofilertimelinemodelfactory.h>
#ifdef LICENSECHECKER
# include <licensechecker/licensecheckerplugin.h> # include <licensechecker/licensecheckerplugin.h>
#endif
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
@@ -84,6 +86,7 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorString) Q_UNUSED(errorString)
#ifdef LICENSECHECKER
LicenseChecker::LicenseCheckerPlugin *licenseChecker LicenseChecker::LicenseCheckerPlugin *licenseChecker
= ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>(); = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
@@ -93,6 +96,9 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin
} else { } else {
qWarning() << "Invalid license, disabling QML Profiler Enterprise features"; qWarning() << "Invalid license, disabling QML Profiler Enterprise features";
} }
#else // LICENSECHECKER
addAutoReleasedObject(new ModelFactory);
#endif
return true; return true;
} }