Subversion Repositories tpanel

Rev

Rev 329 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 329 Rev 354
Line 357... Line 357...
357
 
357
 
358
android: {
358
android: {
359
    INCLUDEPATH += $$(QTDIR)/include/QtGui/$$QT_VERSION/QtGui
359
    INCLUDEPATH += $$(QTDIR)/include/QtGui/$$QT_VERSION/QtGui
360
    LIBS += -lEGL -landroid -lmediandk
360
    LIBS += -lEGL -landroid -lmediandk
361
 
361
 
-
 
362
    if (versionAtLeast(QT_VERSION, 6.0.0)) {
-
 
363
        DISTFILES += \
-
 
364
            android/AndroidManifest.qt6.xml \
-
 
365
            android/build.qt6.gradle \
-
 
366
            android/gradle.properties \
-
 
367
            android/gradle/wrapper/gradle-wrapper.jar \
-
 
368
            android/gradle/wrapper/gradle-wrapper.properties.qt6
-
 
369
    } else {
-
 
370
        DISTFILES += \
-
 
371
            android/AndroidManifest.xml \
-
 
372
            android/build.gradle \
-
 
373
            android/gradle.properties \
-
 
374
            android/gradle/wrapper/gradle-wrapper.jar \
-
 
375
            android/gradle/wrapper/gradle-wrapper.properties
-
 
376
    }
-
 
377
 
362
    DISTFILES += \
378
    DISTFILES += \
363
        android/AndroidManifest.xml \
-
 
364
        android/build.gradle \
-
 
365
        android/gradle.properties \
-
 
366
        android/gradle/wrapper/gradle-wrapper.jar \
-
 
367
        android/gradle/wrapper/gradle-wrapper.properties \
-
 
368
        android/gradlew \
379
            android/gradlew \
369
        android/res/layout/settings_activity.xml \
380
            android/res/layout/settings_activity.xml \
370
        android/res/xml/root_preferences.xml \
381
            android/res/xml/root_preferences.xml \
371
        android/res/values/libs.xml \
382
            android/res/values/libs.xml \
372
        android/res/values/arrays.xml \
383
            android/res/values/arrays.xml \
373
        android/res/values/strings.xml \
384
            android/res/values/strings.xml \
374
        android/res/values/styles.xml \
385
            android/res/values/styles.xml \
375
        android/res/values/themes.xml
386
            android/res/values/themes.xml
376
 
387
 
377
    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
388
    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
378
    CONFIG += sdk_no_version_check
389
    CONFIG += sdk_no_version_check
379
    # Add openSSL library for Android
390
    # Add openSSL library for Android
380
    if (versionAtLeast(QT_VERSION, 6.5.0)) {
391
    if (versionAtLeast(QT_VERSION, 6.5.0)) {