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

QmlProjectManager: Update landing page

Browse Source 
* Make landing page responsive
* Use QtCreator welcome page theme colors
* Remove CMake from landing page
* Separate colors from values to make mocking data less redundant
* Add quick version to qt version check
* Use qml singleton for backend instead of using the root context item

Change-Id: Ic303d4713c348e34197716031b303720702f3e98
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2022-06-20 23:51:16 +02:00
committed by Henning Gründl
parent e3cfbc0a7b
commit 85cd97a334
26 changed files with 800 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/qmlprojectmanager/projectfilecontenttools.cpp
View File

@@ -56,24 +56,37 @@ const QString qdsVersion(const Utils::FilePath &projectFilePath)
{
const QString projectFileContent = readFileContents(projectFilePath);
QRegularExpressionMatch match = qdsVerRegexp.match(projectFileContent);
if (!match.hasMatch())
return {};
QString version = match.captured(1);
return version.isEmpty() ? QObject::tr("Unknown") : version;
if (match.hasMatch()) {
const QString version = match.captured(1);
if (!version.isEmpty())
return version;
}
return QObject::tr("Unknown");
}
QRegularExpression qt6Regexp("(qt6project:)\\s*\"*(true|false)\"*", QRegularExpression::CaseInsensitiveOption);
QRegularExpression quickRegexp("(quickVersion:)\\s*\"(\\d+.\\d+)\"",
QRegularExpression::CaseInsensitiveOption);
QRegularExpression qt6Regexp("(qt6Project:)\\s*\"*(true|false)\"*",
QRegularExpression::CaseInsensitiveOption);
const QString qtVersion(const Utils::FilePath &projectFilePath)
{
const QString defaultReturn = QObject::tr("Unknown");
const QString data = readFileContents(projectFilePath);
QRegularExpressionMatch match = qt6Regexp.match(data);
if (!match.hasMatch())
return defaultReturn;
return match.captured(2).contains("true", Qt::CaseInsensitive)
? QObject::tr("Qt6 or later")
: QObject::tr("Qt5 or earlier");
// First check if quickVersion is contained in the project file
QRegularExpressionMatch match = quickRegexp.match(data);
if (match.hasMatch())
return QString("Qt %1").arg(match.captured(2));
// If quickVersion wasn't found check for qt6Project
match = qt6Regexp.match(data);
if (match.hasMatch())
return match.captured(2).contains("true", Qt::CaseInsensitive) ? QObject::tr("Qt 6")
: QObject::tr("Qt 5");
return defaultReturn;
}
bool isQt6Project(const Utils::FilePath &projectFilePath)