feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
71,292 Commits 108 Branches 368 Tags
bf6f41322c76b340e1db9dcc1f5eaffcd5fa8efd
Commit Graph

10 Commits

Author SHA1 Message Date
Henning Gruendl
590e19acb7 QmlDesigner: Enable environment variable usage 
Change-Id: I91ada6d7dfa5e8376333c5ef27fbd72a5484e4f4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-11-22 15:38:42 +00:00
hjk
0030836f96 Android: Fix compilation 
Amends 35e6991772.

Change-Id: Iba3dcf86b7b1ca7963a0b99798dafec85d19bd65
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
 2021-11-16 11:45:17 +00:00
Piotr Mikolajczyk
35e6991772 Fix bad activity if designviewer built with qt6 
Changed the activity name run, so only the Qt6 version
of Qt Design Viewer is launched.

Change-Id: I79efc2a4ab37e9015b2feabda08ce274c6fca553
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2021-11-16 09:36:22 +00:00
Piotr Mikolajczyk
f45e68d28d Fix to qmlpreview failing to upload files 
Return to correct function call order when preparing
and uploading data to the device.
(Manual pick from master)

Change-Id: I0a78b6614765bfae5c3accd99c1c150540871aac
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2021-11-10 09:51:14 +00:00
Assam Boudjelthia
336cee445e Android: Remove unnecessary parameters in AndroidConfigurations 
No need to manually provide a parameter to adbToolPath inside
AndroidConfigurations itself, functions that needs it can just
get it directly.

Change-Id: Ie319e82e4ea3b7e3ad6588284168f6116bef2686
Reviewed-by: hjk <hjk@qt.io>
 2021-10-13 14:59:03 +00:00
Christian Stenger
416ea51494 Android: Fix compile 
Amends b7c15d4d8d.

Change-Id: I613476daa551cf52ef3b5e905868d027156b6826
Reviewed-by: hjk <hjk@qt.io>
 2021-09-30 10:26:47 +00:00
Assam Boudjelthia
b7c15d4d8d Android: Make fixes to androidqmlpreview 
This amends 261a39cbbd with fixes
to issues noticed after merging the initial patch.

Change-Id: I5f859374cbba3a2e020e6ca0789cc2b387d2739a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2021-09-30 09:06:23 +00:00
Christian Kandeler
49569574de Fix some warnings about unused variables and functions 
Change-Id: I5f0acd9598bc7f3a79963cc4e1b255e2b6fb2e5d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-09-27 08:47:36 +00:00
Assam Boudjelthia
2695bcb167 Android: switch qmlpreview to use new Android Device mechanism 
Amends 261a39cbbd, after switching
Android plugin to use new device selection mechanism in
96255208a5.

Change-Id: I7b2dd1950055f3e6f1a449778f44d57c0c0a8758
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2021-09-21 21:08:00 +00:00
Piotr Mikolajczyk
261a39cbbd Implements previewing qml preview for a qmlproject 
To run it requires either designpreview.apk installed
on the device or apks placed in
<QTCREATATORDIR>/share/qtcreator/android/qtdesignviewer/
Apk filename should follow designpreview_$ARCH.apk

Task-number: QAA-512
Change-Id: Ida955b0fac519112d4623166677a7ba8e9afb1f4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2021-09-21 17:38:54 +00:00