3 files changed, 34 insertions, 2 deletions

diff --git a/Rules.make b/Rules.make
index a1e6f09..86543bb 100644
--- a/Rules.make
+++ b/Rules.make
@@ -18,7 +18,7 @@ ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
 else
         echo CONFIG += qt3 >> $@
 endif
-ifeq ($(CONFIG_QUICK_LAUNCH),)
+ifneq ($(CONFIG_QUICK_LAUNCH),)
         echo contains\( CONFIG, quick-app \) \{ >> $@
         echo CONFIG -= quick-app >> $@
         echo CONFIG += quick-app-lib >> $@
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
new file mode 100644
index 0000000..eafabce
--- a/dev/null
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -0,0 +1,24 @@
+TEMPLATE    = lib
+CONFIG      += qt plugin warn_on release
+HEADERS     = ../../apps/sysinfo/graph.h \
+            ../../apps/sysinfo/load.h  \
+            ../../apps/sysinfo/memory.h  \
+            memoryappletimpl.h  \
+            memorymeter.h  \
+            memorystatus.h \
+            swapfile.h
+SOURCES     = ../../apps/sysinfo/graph.cpp \
+            ../../apps/sysinfo/load.cpp \
+            ../../apps/sysinfo/memory.cpp \
+            memoryappletimpl.cpp  \
+            memorymeter.cpp \
+            memorystatus.cpp \
+            swapfile.cpp
+TARGET      = memoryapplet
+DESTDIR     = $(OPIEDIR)/plugins/applets
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH  += ../$(OPIEDIR)/include
+VERSION     = 1.0.0
+LIBS        += -lqpe -lopie
+
+include ( $(OPIEDIR)/include.pro )
diff --git a/packages b/packages
index 7fac4f0..c48eee8 100644
--- a/packages
+++ b/packages
@@ -84,6 +84,7 @@ CONFIG_LIQUID	noncore/styles/liquid	liquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_MAILIT           noncore/net/mailit      mailit.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
+        CONFIG_MEMORYAPPLET     noncore/applets/memoryappletmemoryapplet.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
@@ -121,7 +122,8 @@ CONFIG_PICKBOARD	inputmethods/pickboard	pickboard.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
         CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
-        CONFIG_QUICKEXEC        quickexecquickexec.pro
+        CONFIG_QPDF2    noncore/graphics/qpdf2qpdf2.pro
+CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
         CONFIG_QWS      core/qwsqws.pro
         CONFIG_REMOTE   noncore/tools/remoteremote.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
@@ -179,5 +181,11 @@ CONFIG_MAIN_TAB_EXAMPLE	examples/main-tab	example.pro
         CONFIG_SIMPLE_EXAMPLE   examples/simpleexample.pro
         CONFIG_SIMPLE_ICON      examples/simple-iconexample.pro
         CONFIG_SIMPLE_MAIN      examples/simple-mainexample.pro
+<<<<<<< packages
+        CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
+CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
+
+=======
         CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
         CONFIG_APPLET_EXAMPLE   examples/appletexample.pro
+>>>>>>> 1.56