summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-04 10:25:30 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-04 10:26:37 (GMT)
commitad8216fef69b31ebb61912d1d2d9c7041cbe5118 (patch)
tree19af055838b3df557af9372761b3683adfa76680
parentfb6a79b85dd80c43308308f720a26f23e0997a31 (diff)
downloadQt-ad8216fef69b31ebb61912d1d2d9c7041cbe5118.zip
Qt-ad8216fef69b31ebb61912d1d2d9c7041cbe5118.tar.gz
Qt-ad8216fef69b31ebb61912d1d2d9c7041cbe5118.tar.bz2
Blank line, trailing whitespace etc fixes for s60main
-rw-r--r--src/s60main/qts60main.cpp1
-rw-r--r--src/s60main/qts60mainapplication.cpp1
-rw-r--r--src/s60main/qts60mainapplication.h1
-rw-r--r--src/s60main/qts60mainappui.cpp1
-rw-r--r--src/s60main/qts60mainappui.h3
-rw-r--r--src/s60main/qts60maindocument.cpp1
-rw-r--r--src/s60main/qts60maindocument.h1
-rw-r--r--src/s60main/s60main.pro14
-rw-r--r--src/s60main/s60main.rss1
9 files changed, 8 insertions, 16 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index c228c0d..67c20b7 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -60,4 +60,3 @@ GLDEF_C TInt E32Main()
{
return EikStart::RunApplication(NewApplication);
}
-
diff --git a/src/s60main/qts60mainapplication.cpp b/src/s60main/qts60mainapplication.cpp
index ed7ae22..9ad7f68 100644
--- a/src/s60main/qts60mainapplication.cpp
+++ b/src/s60main/qts60mainapplication.cpp
@@ -89,4 +89,3 @@ TFileName CQtS60MainApplication::ResourceFileName() const
// End of File
-
diff --git a/src/s60main/qts60mainapplication.h b/src/s60main/qts60mainapplication.h
index 70b6909..e178936 100644
--- a/src/s60main/qts60mainapplication.h
+++ b/src/s60main/qts60mainapplication.h
@@ -91,4 +91,3 @@ class CQtS60MainApplication : public CAknApplication
#endif // __QtS60MainAPPLICATION_H__
// End of File
-
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
index ea6c3d4..ede96cb 100644
--- a/src/s60main/qts60mainappui.cpp
+++ b/src/s60main/qts60mainappui.cpp
@@ -211,4 +211,3 @@ void CQtS60MainAppUi::RestoreMenuL(CCoeControl* aMenuWindow, TInt aMenuId, TMenu
}
// End of File
-
diff --git a/src/s60main/qts60mainappui.h b/src/s60main/qts60mainappui.h
index 6bdeb2e..cec0d98 100644
--- a/src/s60main/qts60mainappui.h
+++ b/src/s60main/qts60mainappui.h
@@ -96,7 +96,7 @@ class CQtS60MainAppUi : public CAknAppUi
* @param aType event type.
*/
void HandleResourceChangeL(TInt aType);
-
+
/**
* HandleStatusPaneSizeChange.
* Called by the framework when the application status pane
@@ -133,4 +133,3 @@ class CQtS60MainAppUi : public CAknAppUi
#endif // __QtS60MainAPPUI_H__
// End of File
-
diff --git a/src/s60main/qts60maindocument.cpp b/src/s60main/qts60maindocument.cpp
index cdbb01d..77d5cc8 100644
--- a/src/s60main/qts60maindocument.cpp
+++ b/src/s60main/qts60maindocument.cpp
@@ -115,4 +115,3 @@ CEikAppUi* CQtS60MainDocument::CreateAppUiL()
}
// End of File
-
diff --git a/src/s60main/qts60maindocument.h b/src/s60main/qts60maindocument.h
index a95e620..77c5aa7 100644
--- a/src/s60main/qts60maindocument.h
+++ b/src/s60main/qts60maindocument.h
@@ -120,4 +120,3 @@ class CQtS60MainDocument : public CAknDocument
#endif // __QTS60MAINDOCUMENT_H__
// End of File
-
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index f74943f..57c9949 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -9,7 +9,7 @@ CONFIG -= qt shared
symbian {
# Note: UID only needed for ensuring that no filename generation conflicts occur
- TARGET.UID3 = 0x2001E61F
+ TARGET.UID3 = 0x2001E61F
CONFIG += png zlib
CONFIG -= jpeg
INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore $$MW_LAYER_SYSTEMINCLUDE
@@ -21,8 +21,8 @@ symbian {
HEADERS = qts60mainapplication.h \
qts60mainappui.h \
qts60maindocument.h
-
- # This block serves the minimalistic resource file for S60 3.1 platforms.
+
+ # This block serves the minimalistic resource file for S60 3.1 platforms.
# Note there is no way to ifdef S60 version in mmp file, that is why the resource
# file is always compiled for WINSCW
minimalAppResource31 = \
@@ -30,23 +30,23 @@ symbian {
"HEADER" \
"TARGETPATH resource\apps" \
"END"
- MMP_RULES += minimalAppResource31
+ MMP_RULES += minimalAppResource31
# s60main needs to be built in ARM mode for GCCE to work.
MMP_RULES+="ALWAYS_BUILD_AS_ARM"
# staticlib should not have any lib depencies in s60
# This seems not to work, some hard coded libs are still added as dependency
- LIBS =
+ LIBS =
} else {
error("$$_FILE_ is intended only for Symbian!")
}
symbian-abld: {
# abld build commands generated resources after the static library is built, and
- # we have dependency to resource from static lib -> resources need to be generated
+ # we have dependency to resource from static lib -> resources need to be generated
# explicitly before library
- rsgFix2.commands = "-$(DEL_FILE) $(EPOCROOT)Epoc32\Data\z\resource\apps\s60main.rsc >NUL 2>&1"
+ rsgFix2.commands = "-$(DEL_FILE) $(EPOCROOT)Epoc32\Data\z\resource\apps\s60main.rsc >NUL 2>&1"
rsgFix.commands = "-$(ABLD) resource $(PLATFORM) $(CFG) 2>NUL"
QMAKE_EXTRA_TARGETS += rsgFix rsgFix2
PRE_TARGETDEPS += rsgFix rsgFix2
diff --git a/src/s60main/s60main.rss b/src/s60main/s60main.rss
index 6e8004c..11c68a3 100644
--- a/src/s60main/s60main.rss
+++ b/src/s60main/s60main.rss
@@ -83,4 +83,3 @@ RESOURCE MENU_PANE r_qt_wrapperapp_menu
{
}
// End of File
-