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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I3bab4e31bc5993c59c7025ebde0846bf6c75810e
This commit is contained in:
Eike Ziller
2021-11-19 10:44:15 +01:00
parent d06183d9cc b569041709
commit eba4115b82
82 changed files with 706 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidqmlpreviewworker.cpp
View File

@@ -75,7 +75,8 @@ ApkInfo::ApkInfo() :
ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A}),
appId(APP_ID),
uploadDir("/data/local/tmp/" APP_ID "/"),
activityId(APP_ID "/org.qtproject.qt5.android.bindings.QtActivity"),
// TODO Add possibility to run Qt5 built version of Qt Design Viewer
activityId(APP_ID "/org.qtproject.qt.android.bindings.QtActivity"),
name("Qt Design Viewer")
{
}

5
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -227,7 +227,10 @@ void ChooseDirectoryPage::initializePage()
"The files in the Android package source directory are copied to the build directory's "
"Android directory and the default files are overwritten."));
m_androidPackageSourceDir->setFilePath(bti.projectFilePath / "android");
const FilePath projectPath = bti.projectFilePath.isFile()
? bti.projectFilePath.parentDir() : bti.projectFilePath;
m_androidPackageSourceDir->setFilePath(projectPath / "android");
connect(m_androidPackageSourceDir, &PathChooser::rawPathChanged,
this, &ChooseDirectoryPage::checkPackageSourceDir);
} else {