Skip to content

Commit 3a47f27

Browse files
dteterukdteteruk
committed
Fix merge changes
1 parent 60281ae commit 3a47f27

File tree

4 files changed

+134
-130
lines changed

4 files changed

+134
-130
lines changed

‎AndroidWD/AndroidWD.pro

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ HEADERS += \
5353
../src/Test/ClickTest.h \
5454
../src/Test/ClickScrollingTest.h \
5555
../src/Test/BasicMouseInterfaceTest.h \
56-
../src/Test/BasicKeyboardInterfaceTest.h
56+
../src/Test/BasicKeyboardInterfaceTest.h \
57+
../src/Test/shutdown_command.h
5758

5859
SOURCES += \
5960
../src/Test/XPathElementFindingTest.cc \
@@ -73,20 +74,22 @@ SOURCES += \
7374
../src/Test/ClickTest.cc \
7475
../src/Test/ClickScrollingTest.cc \
7576
../src/Test/BasicMouseInterfaceTest.cc \
76-
../src/Test/BasicKeyboardInterfaceTest.cc
77+
../src/Test/BasicKeyboardInterfaceTest.cc \
78+
../src/Test/shutdown_command.cc
7779

7880
FORMS += \
7981
../src/Test/ElementSelectingTest.ui \
8082
../src/Test/ClickScrollingTest.ui
8183

8284

8385
INCLUDEPATH += ../inc/ \
86+
../src/
8487

8588

8689
CONFIG( debug, debug|release ) {
87-
LIBS += -L../bin/android/release_dbg/
90+
LIBS += -L../out/bin/android/release_dbg/
8891
} else {
89-
LIBS += -L../bin/android/release/
92+
LIBS += -L../out/bin/android/release/
9093
}
9194

9295
LIBS += -lWebDriver_extension_qt_base \

‎AndroidWD/android/src/org/qtproject/qt5/android/bindings/QtActivity.java

Lines changed: 123 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
7474
import dalvik.system.DexClassLoader;
7575

7676
//@ANDROID-11
77-
//QtCreator import android.app.Fragment;
78-
//QtCreator import android.view.ActionMode;
79-
//QtCreator import android.view.ActionMode.Callback;
77+
import android.app.Fragment;
78+
import android.view.ActionMode;
79+
import android.view.ActionMode.Callback;
8080
//@ANDROID-11
8181

8282
public class QtActivity extends Activity
@@ -1275,130 +1275,130 @@ public void super_onPrepareDialog(int id, Dialog dialog, Bundle args)
12751275
//////////////// Activity API 11 /////////////
12761276

12771277
//@ANDROID-11
1278-
//QtCreator @Override
1279-
//QtCreator public boolean dispatchKeyShortcutEvent(KeyEvent event)
1280-
//QtCreator {
1281-
//QtCreator if (QtApplication.m_delegateObject != null && QtApplication.dispatchKeyShortcutEvent != null)
1282-
//QtCreator return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchKeyShortcutEvent, event);
1283-
//QtCreator else
1284-
//QtCreator return super.dispatchKeyShortcutEvent(event);
1285-
//QtCreator }
1286-
//QtCreator public boolean super_dispatchKeyShortcutEvent(KeyEvent event)
1287-
//QtCreator {
1288-
//QtCreator return super.dispatchKeyShortcutEvent(event);
1289-
//QtCreator }
1290-
//QtCreator //---------------------------------------------------------------------------
1291-
//QtCreator
1292-
//QtCreator @Override
1293-
//QtCreator public void onActionModeFinished(ActionMode mode)
1294-
//QtCreator {
1295-
//QtCreator if (!QtApplication.invokeDelegate(mode).invoked)
1296-
//QtCreator super.onActionModeFinished(mode);
1297-
//QtCreator }
1298-
//QtCreator public void super_onActionModeFinished(ActionMode mode)
1299-
//QtCreator {
1300-
//QtCreator super.onActionModeFinished(mode);
1301-
//QtCreator }
1302-
//QtCreator //---------------------------------------------------------------------------
1303-
//QtCreator
1304-
//QtCreator @Override
1305-
//QtCreator public void onActionModeStarted(ActionMode mode)
1306-
//QtCreator {
1307-
//QtCreator if (!QtApplication.invokeDelegate(mode).invoked)
1308-
//QtCreator super.onActionModeStarted(mode);
1309-
//QtCreator }
1310-
//QtCreator public void super_onActionModeStarted(ActionMode mode)
1311-
//QtCreator {
1312-
//QtCreator super.onActionModeStarted(mode);
1313-
//QtCreator }
1314-
//QtCreator //---------------------------------------------------------------------------
1315-
//QtCreator
1316-
//QtCreator @Override
1317-
//QtCreator public void onAttachFragment(Fragment fragment)
1318-
//QtCreator {
1319-
//QtCreator if (!QtApplication.invokeDelegate(fragment).invoked)
1320-
//QtCreator super.onAttachFragment(fragment);
1321-
//QtCreator }
1322-
//QtCreator public void super_onAttachFragment(Fragment fragment)
1323-
//QtCreator {
1324-
//QtCreator super.onAttachFragment(fragment);
1325-
//QtCreator }
1326-
//QtCreator //---------------------------------------------------------------------------
1327-
//QtCreator
1328-
//QtCreator @Override
1329-
//QtCreator public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
1330-
//QtCreator {
1331-
//QtCreator QtApplication.InvokeResult res = QtApplication.invokeDelegate(parent, name, context, attrs);
1332-
//QtCreator if (res.invoked)
1333-
//QtCreator return (View)res.methodReturns;
1334-
//QtCreator else
1335-
//QtCreator return super.onCreateView(parent, name, context, attrs);
1336-
//QtCreator }
1337-
//QtCreator public View super_onCreateView(View parent, String name, Context context,
1338-
//QtCreator AttributeSet attrs) {
1339-
//QtCreator return super.onCreateView(parent, name, context, attrs);
1340-
//QtCreator }
1341-
//QtCreator //---------------------------------------------------------------------------
1342-
//QtCreator
1343-
//QtCreator @Override
1344-
//QtCreator public boolean onKeyShortcut(int keyCode, KeyEvent event)
1345-
//QtCreator {
1346-
//QtCreator if (QtApplication.m_delegateObject != null && QtApplication.onKeyShortcut != null)
1347-
//QtCreator return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyShortcut, keyCode,event);
1348-
//QtCreator else
1349-
//QtCreator return super.onKeyShortcut(keyCode, event);
1350-
//QtCreator }
1351-
//QtCreator public boolean super_onKeyShortcut(int keyCode, KeyEvent event)
1352-
//QtCreator {
1353-
//QtCreator return super.onKeyShortcut(keyCode, event);
1354-
//QtCreator }
1355-
//QtCreator //---------------------------------------------------------------------------
1356-
//QtCreator
1357-
//QtCreator @Override
1358-
//QtCreator public ActionMode onWindowStartingActionMode(Callback callback)
1359-
//QtCreator {
1360-
//QtCreator QtApplication.InvokeResult res = QtApplication.invokeDelegate(callback);
1361-
//QtCreator if (res.invoked)
1362-
//QtCreator return (ActionMode)res.methodReturns;
1363-
//QtCreator else
1364-
//QtCreator return super.onWindowStartingActionMode(callback);
1365-
//QtCreator }
1366-
//QtCreator public ActionMode super_onWindowStartingActionMode(Callback callback)
1367-
//QtCreator {
1368-
//QtCreator return super.onWindowStartingActionMode(callback);
1369-
//QtCreator }
1370-
//QtCreator //---------------------------------------------------------------------------
1278+
@Override
1279+
public boolean dispatchKeyShortcutEvent(KeyEvent event)
1280+
{
1281+
if (QtApplication.m_delegateObject != null && QtApplication.dispatchKeyShortcutEvent != null)
1282+
return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchKeyShortcutEvent, event);
1283+
else
1284+
return super.dispatchKeyShortcutEvent(event);
1285+
}
1286+
public boolean super_dispatchKeyShortcutEvent(KeyEvent event)
1287+
{
1288+
return super.dispatchKeyShortcutEvent(event);
1289+
}
1290+
//---------------------------------------------------------------------------
1291+
1292+
@Override
1293+
public void onActionModeFinished(ActionMode mode)
1294+
{
1295+
if (!QtApplication.invokeDelegate(mode).invoked)
1296+
super.onActionModeFinished(mode);
1297+
}
1298+
public void super_onActionModeFinished(ActionMode mode)
1299+
{
1300+
super.onActionModeFinished(mode);
1301+
}
1302+
//---------------------------------------------------------------------------
1303+
1304+
@Override
1305+
public void onActionModeStarted(ActionMode mode)
1306+
{
1307+
if (!QtApplication.invokeDelegate(mode).invoked)
1308+
super.onActionModeStarted(mode);
1309+
}
1310+
public void super_onActionModeStarted(ActionMode mode)
1311+
{
1312+
super.onActionModeStarted(mode);
1313+
}
1314+
//---------------------------------------------------------------------------
1315+
1316+
@Override
1317+
public void onAttachFragment(Fragment fragment)
1318+
{
1319+
if (!QtApplication.invokeDelegate(fragment).invoked)
1320+
super.onAttachFragment(fragment);
1321+
}
1322+
public void super_onAttachFragment(Fragment fragment)
1323+
{
1324+
super.onAttachFragment(fragment);
1325+
}
1326+
//---------------------------------------------------------------------------
1327+
1328+
@Override
1329+
public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
1330+
{
1331+
QtApplication.InvokeResult res = QtApplication.invokeDelegate(parent, name, context, attrs);
1332+
if (res.invoked)
1333+
return (View)res.methodReturns;
1334+
else
1335+
return super.onCreateView(parent, name, context, attrs);
1336+
}
1337+
public View super_onCreateView(View parent, String name, Context context,
1338+
AttributeSet attrs) {
1339+
return super.onCreateView(parent, name, context, attrs);
1340+
}
1341+
//---------------------------------------------------------------------------
1342+
1343+
@Override
1344+
public boolean onKeyShortcut(int keyCode, KeyEvent event)
1345+
{
1346+
if (QtApplication.m_delegateObject != null && QtApplication.onKeyShortcut != null)
1347+
return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyShortcut, keyCode,event);
1348+
else
1349+
return super.onKeyShortcut(keyCode, event);
1350+
}
1351+
public boolean super_onKeyShortcut(int keyCode, KeyEvent event)
1352+
{
1353+
return super.onKeyShortcut(keyCode, event);
1354+
}
1355+
//---------------------------------------------------------------------------
1356+
1357+
@Override
1358+
public ActionMode onWindowStartingActionMode(Callback callback)
1359+
{
1360+
QtApplication.InvokeResult res = QtApplication.invokeDelegate(callback);
1361+
if (res.invoked)
1362+
return (ActionMode)res.methodReturns;
1363+
else
1364+
return super.onWindowStartingActionMode(callback);
1365+
}
1366+
public ActionMode super_onWindowStartingActionMode(Callback callback)
1367+
{
1368+
return super.onWindowStartingActionMode(callback);
1369+
}
1370+
//---------------------------------------------------------------------------
13711371
//@ANDROID-11
13721372
//////////////// Activity API 12 /////////////
13731373

13741374
//@ANDROID-12
1375-
//QtCreator @Override
1376-
//QtCreator public boolean dispatchGenericMotionEvent(MotionEvent ev)
1377-
//QtCreator {
1378-
//QtCreator if (QtApplication.m_delegateObject != null && QtApplication.dispatchGenericMotionEvent != null)
1379-
//QtCreator return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchGenericMotionEvent, ev);
1380-
//QtCreator else
1381-
//QtCreator return super.dispatchGenericMotionEvent(ev);
1382-
//QtCreator }
1383-
//QtCreator public boolean super_dispatchGenericMotionEvent(MotionEvent event)
1384-
//QtCreator {
1385-
//QtCreator return super.dispatchGenericMotionEvent(event);
1386-
//QtCreator }
1387-
//QtCreator //---------------------------------------------------------------------------
1388-
//QtCreator
1389-
//QtCreator @Override
1390-
//QtCreator public boolean onGenericMotionEvent(MotionEvent event)
1391-
//QtCreator {
1392-
//QtCreator if (QtApplication.m_delegateObject != null && QtApplication.onGenericMotionEvent != null)
1393-
//QtCreator return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onGenericMotionEvent, event);
1394-
//QtCreator else
1395-
//QtCreator return super.onGenericMotionEvent(event);
1396-
//QtCreator }
1397-
//QtCreator public boolean super_onGenericMotionEvent(MotionEvent event)
1398-
//QtCreator {
1399-
//QtCreator return super.onGenericMotionEvent(event);
1400-
//QtCreator }
1401-
//QtCreator //---------------------------------------------------------------------------
1375+
@Override
1376+
public boolean dispatchGenericMotionEvent(MotionEvent ev)
1377+
{
1378+
if (QtApplication.m_delegateObject != null && QtApplication.dispatchGenericMotionEvent != null)
1379+
return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchGenericMotionEvent, ev);
1380+
else
1381+
return super.dispatchGenericMotionEvent(ev);
1382+
}
1383+
public boolean super_dispatchGenericMotionEvent(MotionEvent event)
1384+
{
1385+
return super.dispatchGenericMotionEvent(event);
1386+
}
1387+
//---------------------------------------------------------------------------
1388+
1389+
@Override
1390+
public boolean onGenericMotionEvent(MotionEvent event)
1391+
{
1392+
if (QtApplication.m_delegateObject != null && QtApplication.onGenericMotionEvent != null)
1393+
return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onGenericMotionEvent, event);
1394+
else
1395+
return super.onGenericMotionEvent(event);
1396+
}
1397+
public boolean super_onGenericMotionEvent(MotionEvent event)
1398+
{
1399+
return super.onGenericMotionEvent(event);
1400+
}
1401+
//---------------------------------------------------------------------------
14021402
//@ANDROID-12
14031403

14041404
}

‎base.gyp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
'src/base/sys_info_mac.cc',
211211
],
212212
} ],
213-
],
214-
['OS=="android"', {
213+
214+
['OS=="android"', {
215215
'sources': [
216216
'src/base/string16.cc',
217217
'src/base/time_posix.cc',
@@ -247,6 +247,7 @@
247247
'src/base/android/jni_android.cc',
248248
],
249249
} ],
250+
]
250251
} , {
251252
'target_name': 'chromium_base_shared',
252253
'type': 'shared_library',

‎build_android.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ export GYP_DEFINES="OS=android"
4343

4444
platform="android"
4545

46-
./build.sh `pwd` $platform $mode
46+
./build.sh `pwd`/out $platform $mode

0 commit comments

Comments
 (0)