Eike Ziller 5a97e8ceb9 Merge remote-tracking branch 'origin/4.13' ...

Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07

2020-07-01 09:01:26 +02:00

..

applications

CMake build/Linux: Install desktop and appstream files

2020-04-30 07:06:20 +00:00

metainfo

CMake build/Linux: Install desktop and appstream files

2020-04-30 07:06:20 +00:00

qtcreator

Merge remote-tracking branch 'origin/4.13'

2020-07-01 09:01:26 +02:00

CMakeLists.txt

CMake build/Linux: Install desktop and appstream files

2020-04-30 07:06:20 +00:00

share.pro

Make Creator compile without Qt tools in some configuration

2017-02-10 13:30:53 +00:00

share.qbs

Android: Fix qbs build

2020-02-12 07:54:59 +00:00