Skip to content

Commit

Permalink
fix build files
Browse files Browse the repository at this point in the history
  • Loading branch information
Holger Schröder committed Sep 7, 2011
1 parent c0ca972 commit 42edba7
Show file tree
Hide file tree
Showing 28 changed files with 416 additions and 3,904 deletions.
25 changes: 2 additions & 23 deletions README
@@ -1,4 +1,4 @@
This source tree contains the MeeGo Touch library
This source tree contains the MLocale library

Building
========
Expand All @@ -12,37 +12,16 @@ see ./configure -help for options.
The reference documentation can be built with "make doc",
if doxygen is available.

Running
=======
The library ships with a demo application called "widgetsgallery"

The duitheme package must be installed before running any MeeGo Touch
applications.

meegotouch-theme is available separately from
http://meego.gitorious.org/meegotouch/meegotouch-theme/ and can
be installed with the following commands:
cd meegotouch-theme
qmake
sudo make install


Build dependencies
==================
- Development headers:
- Qt 4.7
- X11
- Mesa or vendor specific OpenGL libraries
- pkg-config

Optional dependencies
=====================

If found, the following libraries will enable additional
features in the MeeGo Touch library:
features in the MLocale library:

- ICU: I18N and L10N extensions
- GConf2: C++ abstraction layer for gconf settings system
- ContextKit context subscriber: Automatic rotation on supported hardware
- GStreamer 0.10: Media widgets
- DBus: Out of process applet support, out of process theme server support
29 changes: 0 additions & 29 deletions benchmarks/benchmarks.pro
Expand Up @@ -3,37 +3,8 @@ TEMPLATE = subdirs
include(../mkspecs/common.pri)

SUBDIRS = \
mt_mbutton \
mt_mbuttongroup \
mt_mimagewidget \
mt_mlist \
mt_mmenu \
mt_mtoolbar \
mt_mlabel \
\
pt_mapplication \
pt_mbutton \
pt_mcomponentcache \
pt_mcomponentdata \
pt_mcomponentdata2 \
pt_mgles2renderer \
pt_mimagewidget \
pt_mmenu \
pt_minimalmapplication \
pt_minimalqtapplication \
pt_mlayout \
pt_mlocationdatabase \
pt_mprogressindicator \
pt_qapplication \
pt_mlabel \
pt_mlocale \
pt_mslider \
pt_mstylesheet \
pt_mtheme \
pt_mtoolbar \
pt_widgetsgallery \
pt_mwidgetcontroller \
pt_mscalableimage \

contains(DEFINES, HAVE_ICU) {
SUBDIRS += \
Expand Down
14 changes: 4 additions & 10 deletions benchmarks/common_top.pri
Expand Up @@ -7,13 +7,7 @@ INCLUDEPATH += \
. \
../common \
$$MSRCDIR/include \
$$MSRCDIR/corelib/core \
$$MSRCDIR/corelib/widgets \
$$MSRCDIR/corelib/workspace \
$$MSRCDIR/corelib/style \
$$MSRCDIR/views \
$$MSRCDIR/views/style \
../memorybenchmark/
$$MSRCDIR \

DEPENDPATH = $$INCLUDEPATH
QMAKE_LIBDIR += ../../lib
Expand All @@ -22,13 +16,13 @@ QT += testlib dbus svg
TEMPLATE = app
# DEFINES += QT_NO_DEBUG_OUTPUT
DEFINES += UNIT_TEST
target.path = $$[QT_INSTALL_LIBS]/libmeegotouch-benchmarks
target.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks
INSTALLS += target

LIBS += $$mAddLibrary(meegotouchcore)
LIBS += $$mAddLibrary(mlocale)

support_files.files =
support_files.path = $$[QT_INSTALL_LIBS]/libmeegotouch-benchmarks
support_files.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks
INSTALLS += support_files

CONFIG-=app_bundle
2 changes: 1 addition & 1 deletion benchmarks/shell.pri
Expand Up @@ -4,7 +4,7 @@ shell_scripts.CONFIG += no_check_exist

include(../mkspecs/common.pri)

shell_scripts.path += $$M_INSTALL_DATA/libmeegotouch-benchmarks
shell_scripts.path += $$ML_INSTALL_DATA/libmlocale-benchmarks
shell_scripts.depends = FORCE

INSTALLS += \
Expand Down

0 comments on commit 42edba7

Please sign in to comment.