diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/android/templates/build.gradle | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/android/templates/build.gradle')
| -rw-r--r-- | src/android/templates/build.gradle | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index d1ff362269..81acf81c4c 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -1,14 +1,20 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.1' + classpath 'com.android.tools.build:gradle:1.0.0' } } -apply plugin: 'android' +allprojects { + repositories { + jcenter() + } +} + +apply plugin: 'com.android.application' dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) |