diff options
| author | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-01 13:43:37 +0300 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-01 17:10:02 +0300 |
| commit | 7a4a3e284fe6278bf9ce37c30de00f9085332201 (patch) | |
| tree | 13a4128196e9746eb4f00306ed8544810c92a8d7 /benchmarks | |
| parent | fd475948280d76d2bc3c03ed8cab3ab8b701b104 (diff) | |
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
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/common_top.pri | 16 | ||||
| -rw-r--r-- | benchmarks/mt_duilabel/mt_duilabel.pro | 2 | ||||
| -rw-r--r-- | benchmarks/pt_duibutton/pt_duibutton.pro | 2 | ||||
| -rw-r--r-- | benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro | 2 | ||||
| -rw-r--r-- | benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro | 2 | ||||
| -rw-r--r-- | benchmarks/pt_duislider/pt_duislider.pro | 2 |
6 files changed, 21 insertions, 5 deletions
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri index 339402fc..765d1847 100644 --- a/benchmarks/common_top.pri +++ b/benchmarks/common_top.pri @@ -1,6 +1,16 @@ 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 diff --git a/benchmarks/mt_duilabel/mt_duilabel.pro b/benchmarks/mt_duilabel/mt_duilabel.pro index f41d1267..4a719d0d 100644 --- a/benchmarks/mt_duilabel/mt_duilabel.pro +++ b/benchmarks/mt_duilabel/mt_duilabel.pro @@ -6,3 +6,5 @@ TARGET = mt_duilabel SOURCES += mt_duilabel.cpp HEADERS += mt_duilabel.h CONFIG += release + +LIBS += -lduiviews diff --git a/benchmarks/pt_duibutton/pt_duibutton.pro b/benchmarks/pt_duibutton/pt_duibutton.pro index 1e929c64..fe21894b 100644 --- a/benchmarks/pt_duibutton/pt_duibutton.pro +++ b/benchmarks/pt_duibutton/pt_duibutton.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += ../../src/include ../../src/theme +INCLUDEPATH += ../../src/include ../../src/corelib/theme DEPENDPATH += $$INCLUDEPATH TARGET = pt_duibutton diff --git a/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro b/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro index 08d62511..82602c54 100644 --- a/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro +++ b/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += ../../src/include ../../src/theme +INCLUDEPATH += ../../src/include DEPENDPATH += $$INCLUDEPATH TARGET = pt_duiimagewidget diff --git a/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro b/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro index b37b4089..3d54a4c8 100644 --- a/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro +++ b/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro @@ -5,3 +5,5 @@ TARGET = pt_duiprogressindicator SOURCES += pt_duiprogressindicator.cpp HEADERS += pt_duiprogressindicator.h + +LIBS += -lduiviews diff --git a/benchmarks/pt_duislider/pt_duislider.pro b/benchmarks/pt_duislider/pt_duislider.pro index 702da771..c0bab20f 100644 --- a/benchmarks/pt_duislider/pt_duislider.pro +++ b/benchmarks/pt_duislider/pt_duislider.pro @@ -5,3 +5,5 @@ TARGET = pt_duislider SOURCES += pt_duislider.cpp HEADERS += pt_duislider.h + +LIBS += -lduiviews |