forked from qt-creator/qt-creator
Android: Fix translation issues
Add missing Q_OBJECT macros Change-Id: Ic2b01374e4426a7c90e9a8b4c3676e00c200300d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
@@ -67,7 +67,10 @@ const char KeystoreLocationKey[] = "KeystoreLocation";
|
||||
const char BuildTargetSdkKey[] = "BuildTargetSdk";
|
||||
const char VerboseOutputKey[] = "VerboseOutput";
|
||||
|
||||
class PasswordInputDialog : public QDialog {
|
||||
class PasswordInputDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
enum Context{
|
||||
KeystorePassword = 1,
|
||||
@@ -435,3 +438,5 @@ QString PasswordInputDialog::getPassword(Context context, std::function<bool (co
|
||||
}
|
||||
|
||||
} // namespace Android
|
||||
|
||||
#include "androidbuildapkstep.moc"
|
||||
|
||||
@@ -52,21 +52,6 @@ namespace Internal {
|
||||
|
||||
using namespace std::placeholders;
|
||||
|
||||
class OptionsDialog : public QDialog
|
||||
{
|
||||
public:
|
||||
OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
|
||||
QWidget *parent = nullptr);
|
||||
~OptionsDialog();
|
||||
|
||||
QStringList sdkManagerArguments() const;
|
||||
|
||||
private:
|
||||
QPlainTextEdit *argumentDetailsEdit;
|
||||
QLineEdit *argumentsEdit;
|
||||
QFuture<QString> m_optionsFuture;
|
||||
};
|
||||
|
||||
class PackageFilterModel : public QSortFilterProxyModel
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -27,8 +27,14 @@
|
||||
#include "androidconfigurations.h"
|
||||
#include "androidsdkmanager.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QDialog>
|
||||
#include <QFutureWatcher>
|
||||
#include <QWidget>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QLineEdit;
|
||||
class QPlainTextEdit;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Utils { class OutputFormatter; }
|
||||
|
||||
@@ -42,6 +48,23 @@ namespace Ui {
|
||||
|
||||
class AndroidSdkModel;
|
||||
|
||||
class OptionsDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
|
||||
QWidget *parent = nullptr);
|
||||
~OptionsDialog();
|
||||
|
||||
QStringList sdkManagerArguments() const;
|
||||
|
||||
private:
|
||||
QPlainTextEdit *argumentDetailsEdit;
|
||||
QLineEdit *argumentsEdit;
|
||||
QFuture<QString> m_optionsFuture;
|
||||
};
|
||||
|
||||
class AndroidSdkManagerWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
Reference in New Issue
Block a user