Commit 7a4a3e28 authored by Tomas Junnonen's avatar Tomas Junnonen

Changes: Modularized libdui

RevBy: Tomas, Holger
Details: Libdui is split into modules as follows:
 - extensions: application extensions and mashup components
 - settings: settingslanguage
 - views: widget views
 - corelib: everything else
parent fd475948

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

DUISRCDIR = ../../src/
STUBSDIR = ../stubs
INCLUDEPATH += . $$DUISRCDIR $$STUBSDIR $$DUISRCDIR/include $$DUISRCDIR/core $$DUISRCDIR/widgets $$DUISRCDIR/workspace $$DUISRCDIR/style ../memorybenchmark/
INCLUDEPATH += \
. \
$$STUBSDIR \
$$DUISRCDIR/include \
$$DUISRCDIR/corelib/core \
$$DUISRCDIR/corelib/widgets \
$$DUISRCDIR/corelib/workspace \
$$DUISRCDIR/corelib/style \
$$DUISRCDIR/views \
$$DUISRCDIR/views/style \
../memorybenchmark/
DEPENDPATH = $$INCLUDEPATH
QMAKE_LIBDIR += ../../lib
......@@ -17,9 +27,9 @@ win32|macx {
QMAKE_LFLAGS += -F../../lib
LIBS += -framework dui
}
win32:LIBS += -L../../lib -ldui0
win32:LIBS += -lduicore0
} else {
LIBS += ../../lib/libdui.so
LIBS += -lduicore
}
QMAKE_CXXFLAGS += -Werror
......
......@@ -6,3 +6,5 @@ TARGET = mt_duilabel
SOURCES += mt_duilabel.cpp
HEADERS += mt_duilabel.h
CONFIG += release
LIBS += -lduiviews
include(../common_top.pri)
INCLUDEPATH += ../../src/include ../../src/theme
INCLUDEPATH += ../../src/include ../../src/corelib/theme
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_duibutton
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include ../../src/theme
INCLUDEPATH += ../../src/include
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_duiimagewidget
......
......@@ -5,3 +5,5 @@ TARGET = pt_duiprogressindicator
SOURCES += pt_duiprogressindicator.cpp
HEADERS += pt_duiprogressindicator.h
LIBS += -lduiviews
......@@ -5,3 +5,5 @@ TARGET = pt_duislider
SOURCES += pt_duislider.cpp
HEADERS += pt_duislider.h
LIBS += -lduiviews
......@@ -533,6 +533,7 @@ DUI_QMAKE_CACHE="$outpath/.qmake.cache"
cat >>"$DUI_QMAKE_CACHE.tmp" <<EOF
# Autogenerated by configure script
DUI_BUILD_TREE = \$\$quote($outpath)
DUI_SOURCE_TREE = \$\$quote($relpath)
EOF
......
......@@ -64,7 +64,7 @@
****************************************************************************/
#include <QtGui>
#include "../../src/core/duiexport.h"
#include "../../src/corelib/core/duiexport.h"
#include <DuiApplication>
#include <DuiImageWidget>
#include <DuiScene>
......
......@@ -18,9 +18,9 @@ win32|macx {
QMAKE_LFLAGS += -F../../lib
LIBS += -framework dui
}
win32:LIBS += -L../../lib -ldui0
win32:LIBS += -ldui0
} else {
LIBS += ../../lib/libdui.so
LIBS += -lduicore
}
TEMPLATE = app
......
......@@ -25,10 +25,9 @@ win32|macx {
LIBS += -framework \
dui
}
win32:LIBS += -L../../lib \
-ldui0
win32:LIBS += -lduicore0
}
else:LIBS += ../../lib/libdui.so
else:LIBS += -lduicore
TARGET = $$qtLibraryTarget(appletinventory-fakeinstallationsource)
DESTDIR = ../../lib
......
......@@ -15,10 +15,14 @@ win32|macx {
LIBS += -framework \
dui
}
win32:LIBS += -L../../lib \
-ldui0
win32:LIBS += -lduicore0
}
else:LIBS += ../../lib/libdui.so
else:LIBS += \
-lduicore \
-lduiviews \
-lduisettings \
-lduiextensions \
TEMPLATE = app
TARGET = applicationextensiondemo
target.path = $$DUI_INSTALL_BIN
......
......@@ -24,10 +24,9 @@ win32|macx {
LIBS += -framework \
dui
}
win32:LIBS += -L../../../lib \
-ldui0
win32:LIBS += -lduicore0
}
else:LIBS += ../../../lib/libdui.so
else:LIBS += -lduicore
TARGET = $$qtLibraryTarget(demoextension)
DESTDIR = ../../../lib
......
......@@ -24,10 +24,9 @@ win32|macx {
LIBS += -framework \
dui
}
win32:LIBS += -L../../../lib \
-ldui0
win32:LIBS += -lduicore0
}
else:LIBS += ../../../lib/libdui.so
else:LIBS += -lduicore
TARGET = $$qtLibraryTarget(demoextension2)
DESTDIR = ../../../lib
......
......@@ -20,10 +20,9 @@ win32|macx {
QMAKE_LFLAGS += -F$$DUILIB
LIBS += -framework dui
}
win32:LIBS += -L$$DUILIB -ldui0
win32:LIBS += -lduicore0
} else {
LIBS += $$DUILIB/libdui.so
LIBS += -lduicore
}
......
@import "../../libdui/style/fonts.css";
@import "../../libdui/style/colors.css";
@import "../../libduicore/style/fonts.css";
@import "../../libduicore/style/colors.css";
DuiButtonStyle#theme-selection-button {
minimum-size: 10mm 10mm;
......
......@@ -6,7 +6,8 @@ DUISRCINCLUDE = $$DUISRC/include
DUISFWINCLUDE = $$DUIROOT/servicefw/include
INCLUDEPATH += . \
$$DUISRCINCLUDE \
$$DUISRC
$$DUISRC/corelib
QMAKE_LIBDIR += $$DUILIB
win32|macx {
macx {
......@@ -14,10 +15,13 @@ win32|macx {
LIBS += -framework \
dui
}
win32:LIBS += -L../../lib \
-ldui0
win32:LIBS += -lduicore0
}
else:LIBS += ../../lib/libdui.so
else:LIBS += \
-lduicore \
-lduiviews \
-lduisettings \
-lduiextensions \
TEMPLATE = app
TARGET = widgetsgallery
......
......@@ -134,6 +134,18 @@
- pannedRange() was renamed to range()
- pannedPos() was renamed to position()
- updateSizePosData() was split into three new methods: setPosition(), setViewportSize() and setRange().
- Libdui modularization:
- moved src/applicationextension and src/mashup into new library libduiextensions.
- moved src/settingslanguage into new library libduisettings.
- moved part of the views in src/widgets/views to new library libduiviews.
- moved the rest of src/ to new library libduicore.
- You possibly have to update your include pathes.
- You possibly have to update your linking statement in the .pro
file. Before: -ldui, now: -lduicore -lduiviews -lduisettings -lduiextensions.
Or a subset of these four libs.
- Also make sure that you update duitheme in sync with this update, as
it requires some changes in duitheme.
\section v0190
......
include(../mkspecs/common.pri)
INCLUDEPATH += . \
../src/mashup/mashup \
../src/extensions/mashup/mashup \
../src/include \
../src/mashup/appletcommunication \
../src/mashup/appletinterface \
../src/applicationextension
../src/extensions/mashup/appletcommunication \
../src/extensions