forked from qt-creator/qt-creator
Android compile fixes for Qt 4.
Change-Id: I4620a0b8ff29dbb8a0d93f2fc90cc7984f49ed92 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Friedemann Kleint
committed by
Daniel Teske
Daniel Teske
parent
14b2a3507d
commit
b2c80665e8
@@ -226,124 +226,124 @@ void AndroidManifestEditorWidget::initializePage()
|
|||||||
|
|
||||||
m_permissionsComboBox = new QComboBox(mainWidget);
|
m_permissionsComboBox = new QComboBox(mainWidget);
|
||||||
m_permissionsComboBox->insertItems(0, QStringList()
|
m_permissionsComboBox->insertItems(0, QStringList()
|
||||||
<< QStringLiteral("android.permission.ACCESS_CHECKIN_PROPERTIES")
|
<< QLatin1String("android.permission.ACCESS_CHECKIN_PROPERTIES")
|
||||||
<< QStringLiteral("android.permission.ACCESS_COARSE_LOCATION")
|
<< QLatin1String("android.permission.ACCESS_COARSE_LOCATION")
|
||||||
<< QStringLiteral("android.permission.ACCESS_FINE_LOCATION")
|
<< QLatin1String("android.permission.ACCESS_FINE_LOCATION")
|
||||||
<< QStringLiteral("android.permission.ACCESS_LOCATION_EXTRA_COMMANDS")
|
<< QLatin1String("android.permission.ACCESS_LOCATION_EXTRA_COMMANDS")
|
||||||
<< QStringLiteral("android.permission.ACCESS_MOCK_LOCATION")
|
<< QLatin1String("android.permission.ACCESS_MOCK_LOCATION")
|
||||||
<< QStringLiteral("android.permission.ACCESS_NETWORK_STATE")
|
<< QLatin1String("android.permission.ACCESS_NETWORK_STATE")
|
||||||
<< QStringLiteral("android.permission.ACCESS_SURFACE_FLINGER")
|
<< QLatin1String("android.permission.ACCESS_SURFACE_FLINGER")
|
||||||
<< QStringLiteral("android.permission.ACCESS_WIFI_STATE")
|
<< QLatin1String("android.permission.ACCESS_WIFI_STATE")
|
||||||
<< QStringLiteral("android.permission.ACCOUNT_MANAGER")
|
<< QLatin1String("android.permission.ACCOUNT_MANAGER")
|
||||||
<< QStringLiteral("android.permission.AUTHENTICATE_ACCOUNTS")
|
<< QLatin1String("android.permission.AUTHENTICATE_ACCOUNTS")
|
||||||
<< QStringLiteral("android.permission.BATTERY_STATS")
|
<< QLatin1String("android.permission.BATTERY_STATS")
|
||||||
<< QStringLiteral("android.permission.BIND_APPWIDGET")
|
<< QLatin1String("android.permission.BIND_APPWIDGET")
|
||||||
<< QStringLiteral("android.permission.BIND_DEVICE_ADMIN")
|
<< QLatin1String("android.permission.BIND_DEVICE_ADMIN")
|
||||||
<< QStringLiteral("android.permission.BIND_INPUT_METHOD")
|
<< QLatin1String("android.permission.BIND_INPUT_METHOD")
|
||||||
<< QStringLiteral("android.permission.BIND_REMOTEVIEWS")
|
<< QLatin1String("android.permission.BIND_REMOTEVIEWS")
|
||||||
<< QStringLiteral("android.permission.BIND_WALLPAPER")
|
<< QLatin1String("android.permission.BIND_WALLPAPER")
|
||||||
<< QStringLiteral("android.permission.BLUETOOTH")
|
<< QLatin1String("android.permission.BLUETOOTH")
|
||||||
<< QStringLiteral("android.permission.BLUETOOTH_ADMIN")
|
<< QLatin1String("android.permission.BLUETOOTH_ADMIN")
|
||||||
<< QStringLiteral("android.permission.BRICK")
|
<< QLatin1String("android.permission.BRICK")
|
||||||
<< QStringLiteral("android.permission.BROADCAST_PACKAGE_REMOVED")
|
<< QLatin1String("android.permission.BROADCAST_PACKAGE_REMOVED")
|
||||||
<< QStringLiteral("android.permission.BROADCAST_SMS")
|
<< QLatin1String("android.permission.BROADCAST_SMS")
|
||||||
<< QStringLiteral("android.permission.BROADCAST_STICKY")
|
<< QLatin1String("android.permission.BROADCAST_STICKY")
|
||||||
<< QStringLiteral("android.permission.BROADCAST_WAP_PUSH")
|
<< QLatin1String("android.permission.BROADCAST_WAP_PUSH")
|
||||||
<< QStringLiteral("android.permission.CALL_PHONE")
|
<< QLatin1String("android.permission.CALL_PHONE")
|
||||||
<< QStringLiteral("android.permission.CALL_PRIVILEGED")
|
<< QLatin1String("android.permission.CALL_PRIVILEGED")
|
||||||
<< QStringLiteral("android.permission.CAMERA")
|
<< QLatin1String("android.permission.CAMERA")
|
||||||
<< QStringLiteral("android.permission.CHANGE_COMPONENT_ENABLED_STATE")
|
<< QLatin1String("android.permission.CHANGE_COMPONENT_ENABLED_STATE")
|
||||||
<< QStringLiteral("android.permission.CHANGE_CONFIGURATION")
|
<< QLatin1String("android.permission.CHANGE_CONFIGURATION")
|
||||||
<< QStringLiteral("android.permission.CHANGE_NETWORK_STATE")
|
<< QLatin1String("android.permission.CHANGE_NETWORK_STATE")
|
||||||
<< QStringLiteral("android.permission.CHANGE_WIFI_MULTICAST_STATE")
|
<< QLatin1String("android.permission.CHANGE_WIFI_MULTICAST_STATE")
|
||||||
<< QStringLiteral("android.permission.CHANGE_WIFI_STATE")
|
<< QLatin1String("android.permission.CHANGE_WIFI_STATE")
|
||||||
<< QStringLiteral("android.permission.CLEAR_APP_CACHE")
|
<< QLatin1String("android.permission.CLEAR_APP_CACHE")
|
||||||
<< QStringLiteral("android.permission.CLEAR_APP_USER_DATA")
|
<< QLatin1String("android.permission.CLEAR_APP_USER_DATA")
|
||||||
<< QStringLiteral("android.permission.CONTROL_LOCATION_UPDATES")
|
<< QLatin1String("android.permission.CONTROL_LOCATION_UPDATES")
|
||||||
<< QStringLiteral("android.permission.DELETE_CACHE_FILES")
|
<< QLatin1String("android.permission.DELETE_CACHE_FILES")
|
||||||
<< QStringLiteral("android.permission.DELETE_PACKAGES")
|
<< QLatin1String("android.permission.DELETE_PACKAGES")
|
||||||
<< QStringLiteral("android.permission.DEVICE_POWER")
|
<< QLatin1String("android.permission.DEVICE_POWER")
|
||||||
<< QStringLiteral("android.permission.DIAGNOSTIC")
|
<< QLatin1String("android.permission.DIAGNOSTIC")
|
||||||
<< QStringLiteral("android.permission.DISABLE_KEYGUARD")
|
<< QLatin1String("android.permission.DISABLE_KEYGUARD")
|
||||||
<< QStringLiteral("android.permission.DUMP")
|
<< QLatin1String("android.permission.DUMP")
|
||||||
<< QStringLiteral("android.permission.EXPAND_STATUS_BAR")
|
<< QLatin1String("android.permission.EXPAND_STATUS_BAR")
|
||||||
<< QStringLiteral("android.permission.FACTORY_TEST")
|
<< QLatin1String("android.permission.FACTORY_TEST")
|
||||||
<< QStringLiteral("android.permission.FLASHLIGHT")
|
<< QLatin1String("android.permission.FLASHLIGHT")
|
||||||
<< QStringLiteral("android.permission.FORCE_BACK")
|
<< QLatin1String("android.permission.FORCE_BACK")
|
||||||
<< QStringLiteral("android.permission.GET_ACCOUNTS")
|
<< QLatin1String("android.permission.GET_ACCOUNTS")
|
||||||
<< QStringLiteral("android.permission.GET_PACKAGE_SIZE")
|
<< QLatin1String("android.permission.GET_PACKAGE_SIZE")
|
||||||
<< QStringLiteral("android.permission.GET_TASKS")
|
<< QLatin1String("android.permission.GET_TASKS")
|
||||||
<< QStringLiteral("android.permission.GLOBAL_SEARCH")
|
<< QLatin1String("android.permission.GLOBAL_SEARCH")
|
||||||
<< QStringLiteral("android.permission.HARDWARE_TEST")
|
<< QLatin1String("android.permission.HARDWARE_TEST")
|
||||||
<< QStringLiteral("android.permission.INJECT_EVENTS")
|
<< QLatin1String("android.permission.INJECT_EVENTS")
|
||||||
<< QStringLiteral("android.permission.INSTALL_LOCATION_PROVIDER")
|
<< QLatin1String("android.permission.INSTALL_LOCATION_PROVIDER")
|
||||||
<< QStringLiteral("android.permission.INSTALL_PACKAGES")
|
<< QLatin1String("android.permission.INSTALL_PACKAGES")
|
||||||
<< QStringLiteral("android.permission.INTERNAL_SYSTEM_WINDOW")
|
<< QLatin1String("android.permission.INTERNAL_SYSTEM_WINDOW")
|
||||||
<< QStringLiteral("android.permission.INTERNET")
|
<< QLatin1String("android.permission.INTERNET")
|
||||||
<< QStringLiteral("android.permission.KILL_BACKGROUND_PROCESSES")
|
<< QLatin1String("android.permission.KILL_BACKGROUND_PROCESSES")
|
||||||
<< QStringLiteral("android.permission.MANAGE_ACCOUNTS")
|
<< QLatin1String("android.permission.MANAGE_ACCOUNTS")
|
||||||
<< QStringLiteral("android.permission.MANAGE_APP_TOKENS")
|
<< QLatin1String("android.permission.MANAGE_APP_TOKENS")
|
||||||
<< QStringLiteral("android.permission.MASTER_CLEAR")
|
<< QLatin1String("android.permission.MASTER_CLEAR")
|
||||||
<< QStringLiteral("android.permission.MODIFY_AUDIO_SETTINGS")
|
<< QLatin1String("android.permission.MODIFY_AUDIO_SETTINGS")
|
||||||
<< QStringLiteral("android.permission.MODIFY_PHONE_STATE")
|
<< QLatin1String("android.permission.MODIFY_PHONE_STATE")
|
||||||
<< QStringLiteral("android.permission.MOUNT_FORMAT_FILESYSTEMS")
|
<< QLatin1String("android.permission.MOUNT_FORMAT_FILESYSTEMS")
|
||||||
<< QStringLiteral("android.permission.MOUNT_UNMOUNT_FILESYSTEMS")
|
<< QLatin1String("android.permission.MOUNT_UNMOUNT_FILESYSTEMS")
|
||||||
<< QStringLiteral("android.permission.NFC")
|
<< QLatin1String("android.permission.NFC")
|
||||||
<< QStringLiteral("android.permission.PERSISTENT_ACTIVITY")
|
<< QLatin1String("android.permission.PERSISTENT_ACTIVITY")
|
||||||
<< QStringLiteral("android.permission.PROCESS_OUTGOING_CALLS")
|
<< QLatin1String("android.permission.PROCESS_OUTGOING_CALLS")
|
||||||
<< QStringLiteral("android.permission.READ_CALENDAR")
|
<< QLatin1String("android.permission.READ_CALENDAR")
|
||||||
<< QStringLiteral("android.permission.READ_CONTACTS")
|
<< QLatin1String("android.permission.READ_CONTACTS")
|
||||||
<< QStringLiteral("android.permission.READ_FRAME_BUFFER")
|
<< QLatin1String("android.permission.READ_FRAME_BUFFER")
|
||||||
<< QStringLiteral("com.android.browser.permission.READ_HISTORY_BOOKMARKS")
|
<< QLatin1String("com.android.browser.permission.READ_HISTORY_BOOKMARKS")
|
||||||
<< QStringLiteral("android.permission.READ_INPUT_STATE")
|
<< QLatin1String("android.permission.READ_INPUT_STATE")
|
||||||
<< QStringLiteral("android.permission.READ_LOGS")
|
<< QLatin1String("android.permission.READ_LOGS")
|
||||||
<< QStringLiteral("android.permission.READ_OWNER_DATA")
|
<< QLatin1String("android.permission.READ_OWNER_DATA")
|
||||||
<< QStringLiteral("android.permission.READ_PHONE_STATE")
|
<< QLatin1String("android.permission.READ_PHONE_STATE")
|
||||||
<< QStringLiteral("android.permission.READ_SMS")
|
<< QLatin1String("android.permission.READ_SMS")
|
||||||
<< QStringLiteral("android.permission.READ_SYNC_SETTINGS")
|
<< QLatin1String("android.permission.READ_SYNC_SETTINGS")
|
||||||
<< QStringLiteral("android.permission.READ_SYNC_STATS")
|
<< QLatin1String("android.permission.READ_SYNC_STATS")
|
||||||
<< QStringLiteral("android.permission.REBOOT")
|
<< QLatin1String("android.permission.REBOOT")
|
||||||
<< QStringLiteral("android.permission.RECEIVE_BOOT_COMPLETED")
|
<< QLatin1String("android.permission.RECEIVE_BOOT_COMPLETED")
|
||||||
<< QStringLiteral("android.permission.RECEIVE_MMS")
|
<< QLatin1String("android.permission.RECEIVE_MMS")
|
||||||
<< QStringLiteral("android.permission.RECEIVE_SMS")
|
<< QLatin1String("android.permission.RECEIVE_SMS")
|
||||||
<< QStringLiteral("android.permission.RECEIVE_WAP_PUSH")
|
<< QLatin1String("android.permission.RECEIVE_WAP_PUSH")
|
||||||
<< QStringLiteral("android.permission.RECORD_AUDIO")
|
<< QLatin1String("android.permission.RECORD_AUDIO")
|
||||||
<< QStringLiteral("android.permission.REORDER_TASKS")
|
<< QLatin1String("android.permission.REORDER_TASKS")
|
||||||
<< QStringLiteral("android.permission.RESTART_PACKAGES")
|
<< QLatin1String("android.permission.RESTART_PACKAGES")
|
||||||
<< QStringLiteral("android.permission.SEND_SMS")
|
<< QLatin1String("android.permission.SEND_SMS")
|
||||||
<< QStringLiteral("android.permission.SET_ACTIVITY_WATCHER")
|
<< QLatin1String("android.permission.SET_ACTIVITY_WATCHER")
|
||||||
<< QStringLiteral("com.android.alarm.permission.SET_ALARM")
|
<< QLatin1String("com.android.alarm.permission.SET_ALARM")
|
||||||
<< QStringLiteral("android.permission.SET_ALWAYS_FINISH")
|
<< QLatin1String("android.permission.SET_ALWAYS_FINISH")
|
||||||
<< QStringLiteral("android.permission.SET_ANIMATION_SCALE")
|
<< QLatin1String("android.permission.SET_ANIMATION_SCALE")
|
||||||
<< QStringLiteral("android.permission.SET_DEBUG_APP")
|
<< QLatin1String("android.permission.SET_DEBUG_APP")
|
||||||
<< QStringLiteral("android.permission.SET_ORIENTATION")
|
<< QLatin1String("android.permission.SET_ORIENTATION")
|
||||||
<< QStringLiteral("android.permission.SET_PREFERRED_APPLICATIONS")
|
<< QLatin1String("android.permission.SET_PREFERRED_APPLICATIONS")
|
||||||
<< QStringLiteral("android.permission.SET_PROCESS_LIMIT")
|
<< QLatin1String("android.permission.SET_PROCESS_LIMIT")
|
||||||
<< QStringLiteral("android.permission.SET_TIME")
|
<< QLatin1String("android.permission.SET_TIME")
|
||||||
<< QStringLiteral("android.permission.SET_TIME_ZONE")
|
<< QLatin1String("android.permission.SET_TIME_ZONE")
|
||||||
<< QStringLiteral("android.permission.SET_WALLPAPER")
|
<< QLatin1String("android.permission.SET_WALLPAPER")
|
||||||
<< QStringLiteral("android.permission.SET_WALLPAPER_HINTS")
|
<< QLatin1String("android.permission.SET_WALLPAPER_HINTS")
|
||||||
<< QStringLiteral("android.permission.SIGNAL_PERSISTENT_PROCESSES")
|
<< QLatin1String("android.permission.SIGNAL_PERSISTENT_PROCESSES")
|
||||||
<< QStringLiteral("android.permission.STATUS_BAR")
|
<< QLatin1String("android.permission.STATUS_BAR")
|
||||||
<< QStringLiteral("android.permission.SUBSCRIBED_FEEDS_READ")
|
<< QLatin1String("android.permission.SUBSCRIBED_FEEDS_READ")
|
||||||
<< QStringLiteral("android.permission.SUBSCRIBED_FEEDS_WRITE")
|
<< QLatin1String("android.permission.SUBSCRIBED_FEEDS_WRITE")
|
||||||
<< QStringLiteral("android.permission.SYSTEM_ALERT_WINDOW")
|
<< QLatin1String("android.permission.SYSTEM_ALERT_WINDOW")
|
||||||
<< QStringLiteral("android.permission.UPDATE_DEVICE_STATS")
|
<< QLatin1String("android.permission.UPDATE_DEVICE_STATS")
|
||||||
<< QStringLiteral("android.permission.USE_CREDENTIALS")
|
<< QLatin1String("android.permission.USE_CREDENTIALS")
|
||||||
<< QStringLiteral("android.permission.USE_SIP")
|
<< QLatin1String("android.permission.USE_SIP")
|
||||||
<< QStringLiteral("android.permission.VIBRATE")
|
<< QLatin1String("android.permission.VIBRATE")
|
||||||
<< QStringLiteral("android.permission.WAKE_LOCK")
|
<< QLatin1String("android.permission.WAKE_LOCK")
|
||||||
<< QStringLiteral("android.permission.WRITE_APN_SETTINGS")
|
<< QLatin1String("android.permission.WRITE_APN_SETTINGS")
|
||||||
<< QStringLiteral("android.permission.WRITE_CALENDAR")
|
<< QLatin1String("android.permission.WRITE_CALENDAR")
|
||||||
<< QStringLiteral("android.permission.WRITE_CONTACTS")
|
<< QLatin1String("android.permission.WRITE_CONTACTS")
|
||||||
<< QStringLiteral("android.permission.WRITE_EXTERNAL_STORAGE")
|
<< QLatin1String("android.permission.WRITE_EXTERNAL_STORAGE")
|
||||||
<< QStringLiteral("android.permission.WRITE_GSERVICES")
|
<< QLatin1String("android.permission.WRITE_GSERVICES")
|
||||||
<< QStringLiteral("com.android.browser.permission.WRITE_HISTORY_BOOKMARKS")
|
<< QLatin1String("com.android.browser.permission.WRITE_HISTORY_BOOKMARKS")
|
||||||
<< QStringLiteral("android.permission.WRITE_OWNER_DATA")
|
<< QLatin1String("android.permission.WRITE_OWNER_DATA")
|
||||||
<< QStringLiteral("android.permission.WRITE_SECURE_SETTINGS")
|
<< QLatin1String("android.permission.WRITE_SECURE_SETTINGS")
|
||||||
<< QStringLiteral("android.permission.WRITE_SETTINGS")
|
<< QLatin1String("android.permission.WRITE_SETTINGS")
|
||||||
<< QStringLiteral("android.permission.WRITE_SMS")
|
<< QLatin1String("android.permission.WRITE_SMS")
|
||||||
<< QStringLiteral("android.permission.WRITE_SYNC_SETTINGS")
|
<< QLatin1String("android.permission.WRITE_SYNC_SETTINGS")
|
||||||
);
|
);
|
||||||
m_permissionsComboBox->setEditable(true);
|
m_permissionsComboBox->setEditable(true);
|
||||||
layout->addWidget(m_permissionsComboBox, 4, 0);
|
layout->addWidget(m_permissionsComboBox, 4, 0);
|
||||||
@@ -417,7 +417,7 @@ bool AndroidManifestEditorWidget::isModified() const
|
|||||||
|
|
||||||
AndroidManifestEditorWidget::EditorPage AndroidManifestEditorWidget::activePage() const
|
AndroidManifestEditorWidget::EditorPage AndroidManifestEditorWidget::activePage() const
|
||||||
{
|
{
|
||||||
return m_overlayWidget->isVisibleTo(this) ? General : Source;
|
return m_overlayWidget->isVisibleTo(const_cast<AndroidManifestEditorWidget *>(this)) ? General : Source;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AndroidManifestEditorWidget::setActivePage(EditorPage page)
|
bool AndroidManifestEditorWidget::setActivePage(EditorPage page)
|
||||||
|
|||||||
Reference in New Issue
Block a user