summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/demos.pro5
-rw-r--r--demos/embedded/anomaly/anomaly.pro2
-rw-r--r--demos/embedded/anomaly/src/BrowserView.cpp1
-rw-r--r--demos/embedded/anomaly/src/ControlStrip.cpp15
-rw-r--r--demos/embedded/anomaly/src/ControlStrip.h2
-rw-r--r--demos/embedded/anomaly/src/anomaly.qrc1
-rw-r--r--demos/embedded/anomaly/src/images/button-close.pngbin0 -> 1833 bytes
-rw-r--r--demos/embedded/embedded.pro2
-rw-r--r--demos/embedded/flightinfo/flightinfo.pro2
-rw-r--r--demos/embedded/fluidlauncher/fluidlauncher.pro170
-rw-r--r--demos/embedded/lightmaps/lightmaps.pro2
-rw-r--r--demos/embedded/weatherinfo/weatherinfo.pro2
-rw-r--r--demos/shared/shared.pri6
13 files changed, 122 insertions, 88 deletions
diff --git a/demos/demos.pro b/demos/demos.pro
index 83e9355..013d40f 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -43,7 +43,7 @@ SUBDIRS += demos_boxes
}
mac*: SUBDIRS += demos_macmainwindow
-wince*|symbian|embedded|x11: SUBDIRS += embedded
+wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
@@ -67,6 +67,9 @@ symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
demos_chip.subdir = chip
demos_embeddeddialogs.subdir = embeddeddialogs
+demos_embedded.subdir = embedded
+# Because of fluidlauncher
+demos_embedded.depends = demos_deform demos_pathstroke
demos_shared.subdir = shared
demos_deform.subdir = deform
demos_gradients.subdir = gradients
diff --git a/demos/embedded/anomaly/anomaly.pro b/demos/embedded/anomaly/anomaly.pro
index e16ef66..584e5cd 100644
--- a/demos/embedded/anomaly/anomaly.pro
+++ b/demos/embedded/anomaly/anomaly.pro
@@ -26,7 +26,7 @@ RESOURCES += src/anomaly.qrc
symbian {
TARGET.UID3 = 0xA000CF71
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
+ INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/
LIBS += -lesock -lcommdb -linsock # For IAP selection
TARGET.CAPABILITY = NetworkServices
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
diff --git a/demos/embedded/anomaly/src/BrowserView.cpp b/demos/embedded/anomaly/src/BrowserView.cpp
index 0945b89..41318ad 100644
--- a/demos/embedded/anomaly/src/BrowserView.cpp
+++ b/demos/embedded/anomaly/src/BrowserView.cpp
@@ -82,6 +82,7 @@ void BrowserView::initialize()
connect(m_controlStrip, SIGNAL(menuClicked()), SIGNAL(menuButtonClicked()));
connect(m_controlStrip, SIGNAL(backClicked()), m_webView, SLOT(back()));
connect(m_controlStrip, SIGNAL(forwardClicked()), m_webView, SLOT(forward()));
+ connect(m_controlStrip, SIGNAL(closeClicked()), qApp, SLOT(quit()));
QPalette pal = m_webView->palette();
pal.setBrush(QPalette::Base, Qt::white);
diff --git a/demos/embedded/anomaly/src/ControlStrip.cpp b/demos/embedded/anomaly/src/ControlStrip.cpp
index 265d9a0..dc6d5c2 100644
--- a/demos/embedded/anomaly/src/ControlStrip.cpp
+++ b/demos/embedded/anomaly/src/ControlStrip.cpp
@@ -50,6 +50,7 @@ ControlStrip::ControlStrip(QWidget *parent)
menuPixmap.load(":/images/edit-find.png");
backPixmap.load(":/images/go-previous.png");
forwardPixmap.load(":/images/go-next.png");
+ closePixmap.load(":/images/button-close.png");
}
QSize ControlStrip::sizeHint() const
@@ -74,12 +75,18 @@ void ControlStrip::mousePressEvent(QMouseEvent *event)
}
if (x > width() - h) {
- emit forwardClicked();
+ emit closeClicked();
event->accept();
return;
}
if ((x < width() - 2 * h) && (x > width() - 3 * h)) {
+ emit forwardClicked();
+ event->accept();
+ return;
+ }
+
+ if ((x < width() - 3 * h) && (x > width() - 5 * h)) {
emit backClicked();
event->accept();
return;
@@ -95,7 +102,9 @@ void ControlStrip::paintEvent(QPaintEvent *event)
p.fillRect(event->rect(), QColor(32, 32, 32, 192));
p.setCompositionMode(QPainter::CompositionMode_SourceOver);
p.drawPixmap(s, s, menuPixmap);
- p.drawPixmap(width() - 3 * h + s, s, backPixmap);
- p.drawPixmap(width() - h + s, s, forwardPixmap);
+ p.drawPixmap(width() - h + s, s, closePixmap);
+ p.drawPixmap(width() - 3 * h + s, s, forwardPixmap);
+ p.drawPixmap(width() - 5 * h + s, s, backPixmap);
+
p.end();
}
diff --git a/demos/embedded/anomaly/src/ControlStrip.h b/demos/embedded/anomaly/src/ControlStrip.h
index bbaea87..b6003a1 100644
--- a/demos/embedded/anomaly/src/ControlStrip.h
+++ b/demos/embedded/anomaly/src/ControlStrip.h
@@ -58,6 +58,7 @@ signals:
void menuClicked();
void backClicked();
void forwardClicked();
+ void closeClicked();
protected:
void paintEvent(QPaintEvent *event);
@@ -67,6 +68,7 @@ private:
QPixmap menuPixmap;
QPixmap backPixmap;
QPixmap forwardPixmap;
+ QPixmap closePixmap;
};
#endif // CONTROLSTRIP_H
diff --git a/demos/embedded/anomaly/src/anomaly.qrc b/demos/embedded/anomaly/src/anomaly.qrc
index 601a34e..d8ea630 100644
--- a/demos/embedded/anomaly/src/anomaly.qrc
+++ b/demos/embedded/anomaly/src/anomaly.qrc
@@ -5,5 +5,6 @@
<file>images/edit-find.png</file>
<file>images/list-add.png</file>
<file>images/list-remove.png</file>
+ <file>images/button-close.png</file>
</qresource>
</RCC>
diff --git a/demos/embedded/anomaly/src/images/button-close.png b/demos/embedded/anomaly/src/images/button-close.png
new file mode 100644
index 0000000..7a7b048
--- /dev/null
+++ b/demos/embedded/anomaly/src/images/button-close.png
Binary files differ
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 5bd3276..da764d1 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -4,6 +4,8 @@ SUBDIRS = styledemo raycasting flickable digiflip
contains(QT_CONFIG, svg) {
SUBDIRS += embeddedsvgviewer \
desktopservices
+ fluidlauncher.subdir = fluidlauncher
+ fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo
!vxworks:!qnx:SUBDIRS += fluidlauncher
}
diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro
index 7391f88..985cc42 100644
--- a/demos/embedded/flightinfo/flightinfo.pro
+++ b/demos/embedded/flightinfo/flightinfo.pro
@@ -8,7 +8,7 @@ QT += network
symbian {
TARGET.UID3 = 0xA000CF74
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
+ INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/
LIBS += -lesock -lcommdb -linsock # For IAP selection
TARGET.CAPABILITY = NetworkServices
}
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index f71388c..b2916d7 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -61,108 +61,124 @@ symbian {
TARGET.UID3 = 0xA000A641
ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
+ defineReplace(regResourceDir) {
+ symbian-abld|symbian-sbsv2 {
+ return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1))
+ } else {
+ return($${QT_BUILD_TREE}/$$1)
+ }
+ }
+
+ defineReplace(appResourceDir) {
+ symbian-abld|symbian-sbsv2 {
+ return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1))
+ } else {
+ return($${QT_BUILD_TREE}/$$1)
+ }
+ }
+
executables.sources = \
- styledemo.exe \
- deform.exe \
- pathstroke.exe \
- wiggly.exe \
- qftp.exe \
- saxbookmarks.exe \
- desktopservices.exe \
- fridgemagnets.exe \
- softkeys.exe \
- raycasting.exe \
- flickable.exe \
- digiflip.exe \
- lightmaps.exe \
- flightinfo.exe
+ $$QT_BUILD_TREE/demos/embedded/styledemo/styledemo.exe \
+ $$QT_BUILD_TREE/demos/deform/deform.exe \
+ $$QT_BUILD_TREE/demos/pathstroke/pathstroke.exe \
+ $$QT_BUILD_TREE/examples/widgets/wiggly/wiggly.exe \
+ $$QT_BUILD_TREE/examples/network/qftp/qftp.exe \
+ $$QT_BUILD_TREE/examples/xml/saxbookmarks/saxbookmarks.exe \
+ $$QT_BUILD_TREE/demos/embedded/desktopservices/desktopservices.exe \
+ $$QT_BUILD_TREE/examples/draganddrop/fridgemagnets/fridgemagnets.exe \
+ $$QT_BUILD_TREE/examples/widgets/softkeys/softkeys.exe \
+ $$QT_BUILD_TREE/demos/embedded/raycasting/raycasting.exe \
+ $$QT_BUILD_TREE/demos/embedded/flickable/flickable.exe \
+ $$QT_BUILD_TREE/demos/embedded/digiflip/digiflip.exe \
+ $$QT_BUILD_TREE/demos/embedded/lightmaps/lightmaps.exe \
+ $$QT_BUILD_TREE/demos/embedded/flightinfo/flightinfo.exe
executables.path = /sys/bin
reg_resource.sources = \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qftp_reg.rsc\
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/raycasting_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flickable_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/digiflip_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/lightmaps_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flightinfo_reg.rsc
+ $$regResourceDir(demos/embedded/styledemo/styledemo_reg.rsc) \
+ $$regResourceDir(demos/deform/deform_reg.rsc) \
+ $$regResourceDir(demos/pathstroke/pathstroke_reg.rsc) \
+ $$regResourceDir(examples/widgets/wiggly/wiggly_reg.rsc) \
+ $$regResourceDir(examples/network/qftp/qftp_reg.rsc)\
+ $$regResourceDir(examples/xml/saxbookmarks/saxbookmarks_reg.rsc) \
+ $$regResourceDir(demos/embedded/desktopservices/desktopservices_reg.rsc) \
+ $$regResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets_reg.rsc) \
+ $$regResourceDir(examples/widgets/softkeys/softkeys_reg.rsc) \
+ $$regResourceDir(demos/embedded/raycasting/raycasting_reg.rsc) \
+ $$regResourceDir(demos/embedded/flickable/flickable_reg.rsc) \
+ $$regResourceDir(demos/embedded/digiflip/digiflip_reg.rsc) \
+ $$regResourceDir(demos/embedded/lightmaps/lightmaps_reg.rsc) \
+ $$regResourceDir(demos/embedded/flightinfo/flightinfo_reg.rsc)
contains(QT_CONFIG, phonon) {
- reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
+ reg_resource.sources += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc)
}
reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
resource.sources = \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.rsc\
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.rsc
+ $$appResourceDir(demos/embedded/styledemo/styledemo.rsc) \
+ $$appResourceDir(demos/deform/deform.rsc) \
+ $$appResourceDir(demos/pathstroke/pathstroke.rsc) \
+ $$appResourceDir(examples/widgets/wiggly/wiggly.rsc) \
+ $$appResourceDir(examples/network/qftp/qftp.rsc)\
+ $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.rsc) \
+ $$appResourceDir(demos/embedded/desktopservices/desktopservices.rsc) \
+ $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.rsc) \
+ $$appResourceDir(examples/widgets/softkeys/softkeys.rsc) \
+ $$appResourceDir(demos/embedded/raycasting/raycasting.rsc) \
+ $$appResourceDir(demos/embedded/flickable/flickable.rsc) \
+ $$appResourceDir(demos/embedded/digiflip/digiflip.rsc) \
+ $$appResourceDir(demos/embedded/lightmaps/lightmaps.rsc) \
+ $$appResourceDir(demos/embedded/flightinfo/flightinfo.rsc)
resource.path = $$APP_RESOURCE_DIR
mifs.sources = \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fluidlauncher.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.mif
+ $$appResourceDir(demos/embedded/fluidlauncher/fluidlauncher.mif) \
+ $$appResourceDir(demos/embedded/styledemo/styledemo.mif) \
+ $$appResourceDir(demos/deform/deform.mif) \
+ $$appResourceDir(demos/pathstroke/pathstroke.mif) \
+ $$appResourceDir(examples/widgets/wiggly/wiggly.mif) \
+ $$appResourceDir(examples/network/qftp/qftp.mif) \
+ $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.mif) \
+ $$appResourceDir(demos/embedded/desktopservices/desktopservices.mif) \
+ $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.mif) \
+ $$appResourceDir(examples/widgets/softkeys/softkeys.mif) \
+ $$appResourceDir(demos/embedded/raycasting/raycasting.mif) \
+ $$appResourceDir(demos/embedded/flickable/flickable.mif) \
+ $$appResourceDir(demos/embedded/digiflip/digiflip.mif) \
+ $$appResourceDir(demos/embedded/lightmaps/lightmaps.mif) \
+ $$appResourceDir(demos/embedded/flightinfo/flightinfo.mif)
mifs.path = $$APP_RESOURCE_DIR
contains(QT_CONFIG, svg) {
executables.sources += \
- embeddedsvgviewer.exe \
- weatherinfo.exe
+ $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \
+ $$QT_BUILD_TREE/demos/embedded/weatherinfo/weatherinfo.exe
reg_resource.sources += \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
- $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/weatherinfo_reg.rsc
+ $$regResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \
+ $$regResourceDir(demos/embedded/weatherinfo/weatherinfo_reg.rsc)
resource.sources += \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.rsc
+ $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \
+ $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.rsc)
mifs.sources += \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.mif \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.mif
+ $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \
+ $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.mif)
}
contains(QT_CONFIG, webkit) {
- executables.sources += anomaly.exe
- reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
- resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
+ executables.sources += $$QT_BUILD_TREE/demos/embedded/anomaly/anomaly.exe
+ reg_resource.sources += $$regResourceDir(demos/embedded/anomaly/anomaly_reg.rsc)
+ resource.sources += $$appResourceDir(demos/embedded/anomaly/anomaly.rsc)
mifs.sources += \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
+ $$appResourceDir(demos/embedded/anomaly/anomaly.mif)
# Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
executables.pkg_prerules += \
@@ -171,18 +187,18 @@ symbian {
}
contains(QT_CONFIG, phonon) {
- executables.sources += qmediaplayer.exe
- resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.rsc
+ executables.sources += $$QT_BUILD_TREE/demos/qmediaplayer/qmediaplayer.exe
+ resource.sources += $$appResourceDir(demos/qmediaplayer/qmediaplayer.rsc)
mifs.sources += \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif
+ $$appResourceDir(demos/qmediaplayer/qmediaplayer.mif)
}
contains(QT_CONFIG, script) {
- executables.sources += context2d.exe
- reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
- resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
+ executables.sources += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe
+ reg_resource.sources += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)
+ resource.sources += $$appResourceDir(examples/script/context2d/context2d.rsc)
mifs.sources += \
- $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.mif
+ $$appResourceDir(examples/script/context2d/context2d.mif)
}
files.sources = $$PWD/screenshots $$PWD/slides
diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro
index ef1a0a6..ee4cc5a 100644
--- a/demos/embedded/lightmaps/lightmaps.pro
+++ b/demos/embedded/lightmaps/lightmaps.pro
@@ -5,7 +5,7 @@ QT += network
symbian {
TARGET.UID3 = 0xA000CF75
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
+ INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/
LIBS += -lesock -lcommdb -linsock # For IAP selection
TARGET.CAPABILITY = NetworkServices
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro
index f007bbb..9addbbb 100644
--- a/demos/embedded/weatherinfo/weatherinfo.pro
+++ b/demos/embedded/weatherinfo/weatherinfo.pro
@@ -7,7 +7,7 @@ QT += network svg
symbian {
TARGET.UID3 = 0xA000CF77
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
+ INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/
LIBS += -lesock -lcommdb -linsock # For IAP selection
TARGET.CAPABILITY = NetworkServices
}
diff --git a/demos/shared/shared.pri b/demos/shared/shared.pri
index 1541fa7..fb7b04c 100644
--- a/demos/shared/shared.pri
+++ b/demos/shared/shared.pri
@@ -6,12 +6,12 @@ build_all:!build_pass {
}
contains(CONFIG, debug_and_release_target) {
CONFIG(debug, debug|release) {
- LIBS+=-L$$SHARED_FOLDER/debug
+ QMAKE_LIBDIR += $$SHARED_FOLDER/debug
} else {
- LIBS+=-L$$SHARED_FOLDER/release
+ QMAKE_LIBDIR += $$SHARED_FOLDER/release
}
} else {
- LIBS += -L$$SHARED_FOLDER
+ QMAKE_LIBDIR += $$SHARED_FOLDER
}
hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
generated by cgit v0.12 at 2024-11-15 14:00:07 (GMT)