12 files changed, 17 insertions, 17 deletions
diff --git a/packages/neuros-public/neuros-app-photoalbum_git.bb b/packages/neuros-public/neuros-app-photoalbum_git.bb
index 76bb4dc409..32c48e5f67 100644
--- a/packages/neuros-public/neuros-app-photoalbum_git.bb
+++ b/packages/neuros-public/neuros-app-photoalbum_git.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core
+inherit qt4e
 
 SRCREV = "c306f8e1ab92d916d99516d6aebc0749c1be5f5e"
 SRC_URI = "git://git.neurostechnology.com/git/app-photoalbum;protocol=git"
diff --git a/packages/neuros-public/neuros-app-vplayer_git.bb b/packages/neuros-public/neuros-app-vplayer_git.bb
index bf02226b43..0765c9faf4 100644
--- a/packages/neuros-public/neuros-app-vplayer_git.bb
+++ b/packages/neuros-public/neuros-app-vplayer_git.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core
+inherit qt4e
 
 SRCREV = "647d1fa634072f78894aecd090474389eaf6d6a4"
 SRC_URI = "git://git.neurostechnology.com/git/app-vplayer;protocol=git"
diff --git a/packages/neuros-public/neuros-lib-gui_git.bb b/packages/neuros-public/neuros-lib-gui_git.bb
index f599f00608..101dadf493 100644
--- a/packages/neuros-public/neuros-lib-gui_git.bb
+++ b/packages/neuros-public/neuros-lib-gui_git.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core
+inherit qt4e
 
 SRCREV = "5421c6ec09deca54556c82675a96655f6b808d0e"
 SRC_URI = "git://git.neurostechnology.com/git/lib-gui;protocol=git"
diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb
index 6dcce2268e..0db7c400e6 100644
--- a/packages/neuros-public/neuros-lib-widgets_git.bb
+++ b/packages/neuros-public/neuros-lib-widgets_git.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core
+inherit qt4e
 
 SRCREV = "e00c2fe1c5be9f4bb94512363e1b21e07ba5c55d"
 SRC_URI = "git://git.neurostechnology.com/git/lib-widgets;protocol=git"
diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb
index 2ac04be8b2..3f1c0fdf95 100644
--- a/packages/neuros-public/neuros-mainmenu_git.bb
+++ b/packages/neuros-public/neuros-mainmenu_git.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core
+inherit qt4e
 
 SRCREV = "4dfc8ec91c284be45582bc51de8117610269d04d"
 SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git"
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
index 2e5b7bdd15..5cf1e5489b 100644
--- a/packages/neuros-public/neuros-nwm_git.bb
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -6,7 +6,7 @@ PR = "r7"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core update-rc.d
+inherit qt4e update-rc.d
 
 SRCREV = "b042e49d3a71cea6d4545ef6f2fc90979518b22e"
 SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git \
diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb
index f5b79f90bc..179c9c60d8 100644
--- a/packages/neuros-public/neuros-qt-plugins_git.bb
+++ b/packages/neuros-public/neuros-qt-plugins_git.bb
@@ -6,7 +6,7 @@ PR = "r4"
 
 DEPENDS = "qt-embedded"
 
-inherit qtopia4core
+inherit qt4e
 
 SRCREV = "7636920455c7e963f004e394de9db39d2e9ac35f"
 SRC_URI = "git://git.neurostechnology.com/git/qt-plugins;protocol=git"
diff --git a/packages/qsvn/qsvn-qte_0.3.0.bb b/packages/qsvn/qsvn-qte_0.3.0.bb
index 59b46edf9c..02f59d3cdd 100644
--- a/packages/qsvn/qsvn-qte_0.3.0.bb
+++ b/packages/qsvn/qsvn-qte_0.3.0.bb
@@ -1,3 +1,3 @@
 require qsvn.inc
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qsvn"
-inherit qtopia4core
+inherit qt4e
diff --git a/packages/qtnx/qtnx-qte_0.9.bb b/packages/qtnx/qtnx-qte_0.9.bb
index 998666b276..f085a86eb1 100644
--- a/packages/qtnx/qtnx-qte_0.9.bb
+++ b/packages/qtnx/qtnx-qte_0.9.bb
@@ -1,2 +1,2 @@
 require qtnx.inc
-inherit qtopia4core
+inherit qt4e
diff --git a/packages/tasks/task-qtopia-core-console.bb b/packages/tasks/task-qtopia-core-console.bb
index ff0bbc6d12..3d1533a33d 100644
--- a/packages/tasks/task-qtopia-core-console.bb
+++ b/packages/tasks/task-qtopia-core-console.bb
@@ -5,9 +5,9 @@ inherit task
 
 DESCRIPTION_task-qtopia-core-console = "QtopiaCore Core libraries for XML, SQL, Network, Containers and others."
 RDEPENDS_task-qtopia-core-console = "\
-    libqtopiacorecore4 \
-    libqtopiacorenetwork4 \
-    libqtopiacorexml4 \
-    libqtopiacoresql4"
+    libqt-embeddedcore4 \
+    libqt-embeddednetwork4 \
+    libqt-embeddedxml4 \
+    libqt-embeddedsql4"
 
     
diff --git a/packages/tasks/task-qtopia-core-gui.bb b/packages/tasks/task-qtopia-core-gui.bb
index 5b5e467305..1e2f27418e 100644
--- a/packages/tasks/task-qtopia-core-gui.bb
+++ b/packages/tasks/task-qtopia-core-gui.bb
@@ -6,6 +6,6 @@ inherit task
 DESCRIPTION_task-qtopia-core-gui = "QtopiaCore GUI library"
 RDEPENDS_task-qtopia-core-gui = " \
     task-qtopia-core-console \
-    libqtopiacoregui4 \
-    libqtopiacorescript4 \
-    libqtopiacoredbus4"
+    libqt-embeddedgui4 \
+    libqt-embeddedscript4 \
+    libqt-embeddeddbus4"
diff --git a/packages/webkit/webkit-qtopia_svn.bb b/packages/webkit/webkit-qtopia_svn.bb
index 03e1114b81..ce32404b83 100644
--- a/packages/webkit/webkit-qtopia_svn.bb
+++ b/packages/webkit/webkit-qtopia_svn.bb
@@ -1,5 +1,5 @@
 require webkit-qt.inc
-inherit qtopia4core
+inherit qt4e
 
 WEBKIT_EXTRA_OPTIONS += "QT+=xml QT+=network"