Skip to content

Commit

Permalink
Remove Q_WS_*, symbian and maemo code in QtDeclarative
Browse files Browse the repository at this point in the history
Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
  • Loading branch information
Damian Jansen authored and Qt by Nokia committed Oct 26, 2011
1 parent 27933ae commit 4ae7aec
Show file tree
Hide file tree
Showing 68 changed files with 73 additions and 1,614 deletions.
Expand Up @@ -18,12 +18,3 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati

INSTALLS = sources ImageProviderCore_sources target

symbian:{
CONFIG += qt_example
TARGET.EPOCALLOWDLLDATA = 1

importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir
importFiles.path = ImageProviderCore
DEPLOYMENT += importFiles
}
maemo5: CONFIG += qt_example
5 changes: 0 additions & 5 deletions examples/declarative/cppextensions/plugins/plugins.pro
Expand Up @@ -23,8 +23,3 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok

INSTALLS += qdeclarativesources sources target

symbian {
CONFIG += qt_example
TARGET.EPOCALLOWDLLDATA = 1
}
maemo5: CONFIG += qt_example
3 changes: 0 additions & 3 deletions examples/declarative/declarative.pro
Expand Up @@ -9,9 +9,6 @@ SUBDIRS = \
tutorials \
script

# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name
symbian:SUBDIRS -= plugins

# These examples contain no C++ and can simply be copied
sources.files = \
animation \
Expand Down
3 changes: 0 additions & 3 deletions examples/declarative/painteditem/smile/smile.pro
Expand Up @@ -9,6 +9,3 @@ SOURCES += main.cpp

CONFIG += console

symbian {
TARGET.EPOCHEAPSIZE = 0x20000 0x5000000
}
1 change: 0 additions & 1 deletion examples/declarative/script/shell/shell.pro
Expand Up @@ -2,7 +2,6 @@ QT += declarative

win32: CONFIG += console
mac:CONFIG -= app_bundle
symbian: CONFIG += qt_example

SOURCES += main.cpp

6 changes: 1 addition & 5 deletions examples/embedded/qmlcalculator/deployment.pri
@@ -1,8 +1,4 @@
qmlcalculator_src = $$PWD/../../declarative/calculator
symbian {
load(data_caging_paths)
qmlcalculator_uid3 = A000E3FB
qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3
}

qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core
DEPLOYMENT += qmlcalculator_files
19 changes: 1 addition & 18 deletions examples/embedded/qmlcalculator/qmlcalculator.cpp
Expand Up @@ -44,13 +44,6 @@
#include <QtDeclarative/QDeclarativeView>
#include <QtDeclarative/QDeclarativeEngine>

#if defined(Q_OS_SYMBIAN)
#include <eikenv.h>
#include <eikappui.h>
#include <aknenv.h>
#include <aknappui.h>
#endif // Q_OS_SYMBIAN

int main(int argc, char *argv[])
{
QApplication application(argc, argv);
Expand All @@ -60,21 +53,11 @@ int main(int argc, char *argv[])
view.setSource(QUrl(mainQmlApp));
view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));

#if defined(QT_KEYPAD_NAVIGATION)
QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
#endif // QT_KEYPAD_NAVIGATION

#if defined(Q_OS_SYMBIAN)
CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi());
TRAPD(error,
if (appUi)
appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait)
)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.show();
#endif // Q_OS_SYMBIAN

return application.exec();
}
9 changes: 1 addition & 8 deletions examples/embedded/qmlcalculator/qmlcalculator.pro
@@ -1,12 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative
SOURCES += $$PWD/qmlcalculator.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
LIBS += -lcone -leikcore -lavkon # Screen orientation
}
6 changes: 1 addition & 5 deletions examples/embedded/qmlclocks/deployment.pri
@@ -1,8 +1,4 @@
qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks
symbian {
load(data_caging_paths)
qmlclocks_uid3 = A000E3FC
qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3
}

qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content
DEPLOYMENT += qmlclocks_files
17 changes: 0 additions & 17 deletions examples/embedded/qmlclocks/qmlclocks.cpp
Expand Up @@ -44,13 +44,6 @@
#include <QtDeclarative/QDeclarativeView>
#include <QtDeclarative/QDeclarativeEngine>

#if defined(Q_OS_SYMBIAN)
#include <eikenv.h>
#include <eikappui.h>
#include <aknenv.h>
#include <aknappui.h>
#endif // Q_OS_SYMBIAN

int main(int argc, char *argv[])
{
QApplication application(argc, argv);
Expand All @@ -65,16 +58,6 @@ int main(int argc, char *argv[])
QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
#endif // QT_KEYPAD_NAVIGATION

#if defined(Q_OS_SYMBIAN)
CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi());
TRAPD(error,
if (appUi)
appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape)
)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.show();
#endif // Q_OS_SYMBIAN

return application.exec();
}
9 changes: 1 addition & 8 deletions examples/embedded/qmlclocks/qmlclocks.pro
@@ -1,12 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative
SOURCES += $$PWD/qmlclocks.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
LIBS += -lcone -leikcore -lavkon # Screen orientation
}
6 changes: 1 addition & 5 deletions examples/embedded/qmldialcontrol/deployment.pri
@@ -1,8 +1,4 @@
qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol
symbian {
load(data_caging_paths)
qmldialcontrol_uid3 = A000E3FD
qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3
}

qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content
DEPLOYMENT += qmldialcontrol_files
5 changes: 0 additions & 5 deletions examples/embedded/qmldialcontrol/qmldialcontrol.cpp
Expand Up @@ -58,11 +58,6 @@ int main(int argc, char *argv[])
QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
#endif // QT_KEYPAD_NAVIGATION

#if defined(Q_OS_SYMBIAN)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.show();
#endif // Q_OS_SYMBIAN

return application.exec();
}
8 changes: 1 addition & 7 deletions examples/embedded/qmldialcontrol/qmldialcontrol.pro
@@ -1,11 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative
SOURCES += $$PWD/qmldialcontrol.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
}
6 changes: 1 addition & 5 deletions examples/embedded/qmleasing/deployment.pri
@@ -1,8 +1,4 @@
qmleasing_src = $$PWD/../../../examples/declarative/animation/easing
symbian {
load(data_caging_paths)
qmleasing_uid3 = A000E3FE
qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3
}

qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content
DEPLOYMENT += qmleasing_files
5 changes: 0 additions & 5 deletions examples/embedded/qmleasing/qmleasing.cpp
Expand Up @@ -58,11 +58,6 @@ int main(int argc, char *argv[])
QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
#endif // QT_KEYPAD_NAVIGATION

#if defined(Q_OS_SYMBIAN)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.show();
#endif // Q_OS_SYMBIAN

return application.exec();
}
8 changes: 1 addition & 7 deletions examples/embedded/qmleasing/qmleasing.pro
@@ -1,11 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative
SOURCES += $$PWD/qmleasing.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
}
6 changes: 1 addition & 5 deletions examples/embedded/qmlflickr/deployment.pri
@@ -1,8 +1,4 @@
qmlflickr_src = $$PWD/../../declarative/flickr
symbian {
load(data_caging_paths)
qmlflickr_uid3 = A000E3FF
qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3
}

qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile
DEPLOYMENT += qmlflickr_files
5 changes: 0 additions & 5 deletions examples/embedded/qmlflickr/qmlflickr.cpp
Expand Up @@ -97,13 +97,8 @@ int main(int argc, char *argv[])
view.setSource(QUrl(mainQmlApp));
view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));

#if defined(Q_OS_SYMBIAN)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.setGeometry(QRect(100, 100, 360, 640));
view.show();
#endif // Q_OS_SYMBIAN
return application.exec();
}

10 changes: 1 addition & 9 deletions examples/embedded/qmlflickr/qmlflickr.pro
@@ -1,13 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative network
SOURCES += $$PWD/qmlflickr.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.CAPABILITY = NetworkServices
# Maximum heap size set to 128 MB in order to allow loading large images.
TARGET.EPOCHEAPSIZE = 0x20000 0x8000000
}
6 changes: 1 addition & 5 deletions examples/embedded/qmlphotoviewer/deployment.pri
@@ -1,8 +1,4 @@
qmlphotoviewer_src = $$PWD/../../declarative/photoviewer
symbian {
load(data_caging_paths)
qmlphotoviewer_uid3 = A000E400
qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3
}

qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore
DEPLOYMENT += qmlphotoviewer_files
5 changes: 0 additions & 5 deletions examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
Expand Up @@ -97,13 +97,8 @@ int main(int argc, char *argv[])
view.setResizeMode(QDeclarativeView::SizeRootObjectToView);

QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));

#if defined(Q_OS_SYMBIAN)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.setGeometry(QRect(100, 100, 360, 640));
view.show();
#endif // Q_OS_SYMBIAN
return application.exec();
}

9 changes: 1 addition & 8 deletions examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
@@ -1,12 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative network
SOURCES += $$PWD/qmlphotoviewer.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.CAPABILITY = NetworkServices
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
}
6 changes: 1 addition & 5 deletions examples/embedded/qmltwitter/deployment.pri
@@ -1,8 +1,4 @@
qmltwitter_src = $$PWD/../../declarative/twitter
symbian {
load(data_caging_paths)
qmltwitter_uid3 = A000E401
qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3
}

qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore
DEPLOYMENT += qmltwitter_files
5 changes: 0 additions & 5 deletions examples/embedded/qmltwitter/qmltwitter.cpp
Expand Up @@ -96,13 +96,8 @@ int main(int argc, char *argv[])
view.setSource(QUrl(mainQmlApp));
view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));

#if defined(Q_OS_SYMBIAN)
view.showFullScreen();
#else // Q_OS_SYMBIAN
view.setGeometry(QRect(100, 100, 360, 640));
view.show();
#endif // Q_OS_SYMBIAN
return application.exec();
}

9 changes: 1 addition & 8 deletions examples/embedded/qmltwitter/qmltwitter.pro
@@ -1,12 +1,5 @@
!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.")
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")

QT += declarative network
SOURCES += $$PWD/qmltwitter.cpp
include($$PWD/deployment.pri)

symbian {
TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri
CONFIG += qt_example
TARGET.CAPABILITY = NetworkServices
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
}
12 changes: 0 additions & 12 deletions src/declarative/declarative.pro
Expand Up @@ -35,18 +35,6 @@ include(items/items.pri)
include(particles/particles.pri)
include(designer/designer.pri)

symbian: {
TARGET.UID3=0x2001E623
LIBS += -lefsrv

contains(QT_CONFIG, freetype) {
DEFINES += QT_NO_FONTCONFIG
INCLUDEPATH += \
../3rdparty/freetype/src \
../3rdparty/freetype/include
}
}

linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND

DEFINES += QT_NO_OPENTYPE
Expand Down

0 comments on commit 4ae7aec

Please sign in to comment.