Skip to content

Commit

Permalink
LSM #17, Qt5 #5.0.1, luna-webkit-api #2, keyboard-efigs #5, ..ipc-mes…
Browse files Browse the repository at this point in the history 
…sages #3

keyboard-efigs: #2 -> #5
    dc3a0ed Revert commenting out of common.pri in pro file
    b0bd042 Modify IME interface to use LS2 handle instead of mainloop

luna-sysmgr: #10 -> #17
    90a49dc Modify IME interface to pass LS2 handle instead of mainloop
    63e526a Fix QGraphicsSceneEvents position translations to send to IPC
    92b41e9 Eliminate duplicated mouse events in Qt5
    ba5dbdf Fix to OverlayWindowManager::mapCoordToWindow
    219b7af Merge "Add mouse hover support in CardHostWindow"
    e8cc8ba Merge "Add mouse wheel event handler to HostWindow"
    64c7b6f Add mouse hover support in CardHostWindow
    26abd04 Add mouse wheel event handler to HostWindow
    ebaced2 Merge "Revert "Revert "Fix system menu not showing"""
    034f3cc Merge "Return and tab events generating wrong QKeyEvent text"
    7ba8567 Revert "Revert "Fix system menu not showing""
    0843fd7 Fix crash processing QGestureEvents in MenuWindowManager
    fbd29de Revert "Fix system menu not showing"
    15af482 Return and tab events generating wrong QKeyEvent text
    ca359fe Revert "Add mouse wheel event handler to HostWindow"
    2beb5d4 Add mouse wheel event handler to HostWindow
    867afbb Merge "Fix mouse input for QML components"
    e14a9b7 Fix mouse input for QML components
    0373047 Fix GF-1788 universal search focus problem
    4bd1ede Fix system menu not showing

luna-sysmgr-ipc-messages: #2 -> #3
    b4f18b2 Add mouse hover event to SysMgrEvent
    89522b3 Add mouse wheel event to SysMgrEvent

luna-webkit-api: #1.01 -> #2
    6639d19 Modify IME interface to pass LS2 handle instead of mainloop

qtbase: -> version 5.01
qtjsbackend: -> version 5.01
qtxmlpatterns: -> version 5.01
qtscript: -> version 5.01
qtquick1: -> version 5.01
qtdeclarative: -> version 5.01

Open-webOS-DCO-1.0-Signed-off-by: Roger Stringer <[email protected]>

Change-Id: I83fc454a1b5b3b2fad91e2d26107cb42c29d31b8
Reviewed-on: https://g2g.palm.com/1648
Reviewed-by: Build Verification
Tested-by: Roger Stringer <[email protected]>
Reviewed-by: Eric Blade <[email protected]>
Reviewed-by: Roger Stringer <[email protected]>
  • Loading branch information
Roger Stringer committed Mar 8, 2013
1 parent 589e967 commit 5f92a4b
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions build-webos-desktop.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# LICENSE@@@

VERSION=8.0
VERSION=9.0

PROCS=`grep -c processor /proc/cpuinfo`

Expand Down Expand Up @@ -437,22 +437,22 @@ function build_qt5
##############################

## Build dependencies: "qtbase" => "",
build_qt5_module qtbase 4eac2c4728da85a5cdf91ec25170b3417f7deb68
build_qt5_module qtbase v5.0.1

## Build dependencies: "qtjsbackend" => "qtbase",
build_qt5_module qtjsbackend b41c2151fdfca3f63a6cd45f6c69ae678694b63e
build_qt5_module qtjsbackend v5.0.1

## Build dependencies: "qtxmlpatterns" => "qtbase
build_qt5_module qtxmlpatterns d42b8e30e8ac2a33a877d37bd0ffbf616580d7fc
build_qt5_module qtxmlpatterns v5.0.1

## Build dependencies: "qtscript" => "qtbase",
build_qt5_module qtscript e27e5bade2407e022f1814eaaf6cea8bb6741465
build_qt5_module qtscript v5.0.1

## Build dependencies: "qtquick1" => "qtbase,qtscript,qtxmlpatterns,...
build_qt5_module qtquick1 a1ebb0367d8dd02ead0abe4ab9a82c379428666d
build_qt5_module qtquick1 v5.0.1

## Build dependencies: "qtdeclarative" => "qtbase,qtxmlpatterns,qtjsbackend,...
build_qt5_module qtdeclarative 5e4cc79e0669b76f8f5bf5192a0b7001ff8f4d58
build_qt5_module qtdeclarative v5.0.1

## Build dependencies: "qtsensors" => "qtbase,qtdeclarative",
build_qt5_module qtsensors 6323be3e2fc1b69145f37cda1d0214ec5fa3cb44
Expand All @@ -461,7 +461,7 @@ function build_qt5
build_qt5_module qt3d d723769d90331f4cde8dcb5aa3973e5c6bad8753

## Build dependencies: "qtlocation" => "qtbase,qtdeclarative,qt3d,...
build_qt5_module qtlocation 0ad2be463848898235abd8ebeebc076042cf398f
build_qt5_module qtlocation ac83b242c26d5b8750b6bf0f9ed0bac0e4569b6c

## Build dependencies: "qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
build_qt5_module qtwebkit 1ced62033ffe82134c2f5707b6ef197fa3e85375
Expand Down Expand Up @@ -1036,6 +1036,8 @@ function build_webappmanager
rm -rf debug-x86/.moc/moc_*.cpp
rm -rf debug-x86/.moc/*.moc
fi
sed -i -e 's@settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);@settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, false);@g' Src/webbase/SysMgrWebBridge.cpp
sed -i -e 's@settings()->setOfflineWebApplicationCachePath(storagePath);@//settings()->setOfflineWebApplicationCachePath(storagePath);@g' Src/webbase/SysMgrWebBridge.cpp
$QMAKE
fi
make $JOBS -f Makefile.Ubuntu
Expand Down Expand Up @@ -1664,7 +1666,7 @@ set -x

pre_build

export LSM_TAG="10"
export LSM_TAG="17"
if [ ! -d "$BASE/luna-sysmgr" ] || [ ! -d "$BASE/tarballs" ] || [ ! -e "$BASE/tarballs/luna-sysmgr_${LSM_TAG}.zip" ] ; then
do_fetch openwebos/luna-sysmgr ${LSM_TAG} luna-sysmgr submissions/
fi
Expand All @@ -1689,14 +1691,14 @@ build luna-service2 149
#build qt4 4
build_qt5
build npapi-headers 0.4
build luna-webkit-api 1.01
build luna-webkit-api 2
#build webkit 0.54

build luna-sysmgr-ipc 2
build luna-sysmgr-ipc-messages 2
build luna-sysmgr-ipc-messages 3
build luna-sysmgr-common 6
build luna-sysmgr $LSM_TAG
build keyboard-efigs 2
build keyboard-efigs 5

build webappmanager 5
build luna-init 1.03
Expand Down

0 comments on commit 5f92a4b

Please sign in to comment.