feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix build with namespaced Qt.

Browse Source 
Change-Id: Ie888c2f02e20e866f19854ab621a87e01569b0d5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Christian Kandeler
2013-09-13 13:47:39 +02:00
parent dfbe799590
commit f4dc469fe1
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/addnewavddialog.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AddNewAVDDialog</class>
<widget class="QDialog" name="AddNewAVDDialog">
<class>Android::Internal::AddNewAVDDialog</class>
<widget class="QDialog" name="Android::Internal::AddNewAVDDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -113,7 +113,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>AddNewAVDDialog</receiver>
<receiver>Android::Internal::AddNewAVDDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -129,7 +129,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>AddNewAVDDialog</receiver>
<receiver>Android::Internal::AddNewAVDDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

5
src/plugins/android/androiddevicedialog.h
View File

@@ -39,14 +39,11 @@ QT_BEGIN_NAMESPACE
class QModelIndex;
QT_END_NAMESPACE
namespace Ui {
class AndroidDeviceDialog;
}
namespace Android {
namespace Internal {
class AndroidDeviceModel;
namespace Ui { class AndroidDeviceDialog; }
class AndroidDeviceDialog : public QDialog
{

8
src/plugins/android/androiddevicedialog.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AndroidDeviceDialog</class>
<widget class="QDialog" name="AndroidDeviceDialog">
<class>Android::Internal::AndroidDeviceDialog</class>
<widget class="QDialog" name="Android::Internal::AndroidDeviceDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -62,7 +62,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>AndroidDeviceDialog</receiver>
<receiver>Android::Internal::AndroidDeviceDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -78,7 +78,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>AndroidDeviceDialog</receiver>
<receiver>Android::Internal::AndroidDeviceDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">