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

QmlDesigner: Change the raw pointer to uniqeptr and rename the main file

Browse Source 
Change-Id: I751359d65735b1be9b3e6b27946c23c278a78a6e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Burak Hancerli
2023-05-08 15:56:55 +02:00
parent 5a88c3ffc1
commit 7a2b1f724b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qml2puppet/CMakeLists.txt
View File

@@ -45,7 +45,7 @@ add_qtc_executable(qml2puppet
INCLUDES
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
SOURCES
qml2puppet/main.cpp
qml2puppet/qml2puppetmain.cpp
qml2puppet/qmlbase.h qml2puppet/appmetadata.h
qml2puppet/qmlpuppet.h qml2puppet/qmlpuppet.cpp qml2puppet/configcrashpad.h
qmlpuppet.qrc

13
src/tools/qml2puppet/qml2puppet/main.cpp → src/tools/qml2puppet/qml2puppet/qml2puppetmain.cpp
View File

@@ -7,25 +7,24 @@
#include "runner/qmlruntime.h"
#endif
QmlBase *getQmlRunner(int &argc, char **argv)
auto getQmlRunner(int &argc, char **argv)
{
#ifdef ENABLE_INTERNAL_QML_RUNTIME
QString qmlRuntime("--qml-runtime");
for (int i = 0; i < argc; i++) {
if (!strcmp(argv[i], "--qml-runtime")){
if (!qmlRuntime.compare(QString::fromLocal8Bit(argv[i]))) {
qInfo() << "Starting QML Runtime";
return new QmlRuntime(argc, argv);
return std::unique_ptr<QmlBase>(new QmlRuntime(argc, argv));
}
}
#endif
qInfo() << "Starting QML Puppet";
return new QmlPuppet(argc, argv);
return std::unique_ptr<QmlBase>(new QmlPuppet(argc, argv));
}
int main(int argc, char *argv[])
{
QDSMeta::Logging::registerMessageHandler();
QDSMeta::AppInfo::registerAppInfo("Qml2Puppet");
QmlBase *qmlRunner = getQmlRunner(argc, argv);
return qmlRunner->run();
return getQmlRunner(argc, argv)->run();
}