diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-12 06:37:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-12 06:37:02 (GMT) |
commit | 1c20abaaeef1ab448526e5821db06350537c1333 (patch) | |
tree | 554a714b3b3b39807e046faeb612a67401c4b219 /qmake/generators | |
parent | a653056f806a3410b4aa76df78fae736d4f93791 (diff) | |
parent | 787b56fbcad2eda8ababc919a535fb2f9ef48fb5 (diff) | |
download | Qt-1c20abaaeef1ab448526e5821db06350537c1333.zip Qt-1c20abaaeef1ab448526e5821db06350537c1333.tar.gz Qt-1c20abaaeef1ab448526e5821db06350537c1333.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Show EditorDateEdit before changing selection in qdatetimeedit test
Moved runonphone target to prf files for all build systems.
Incorrectly named keys in QS60StyleEnums::SkinParts
Fix recursive targets for src.pro
Fix recursive 'make sis' for symbian builds
Fixed destdir not being defined.
Enable runonphone target for libraries as well.
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/symbian/symmake.cpp | 14 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake.h | 1 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
4 files changed, 0 insertions, 19 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 6082aeb..ff58270 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1112,17 +1112,3 @@ void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t) t << "distclean: clean dodistclean" << endl; t << endl; } - -void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QStringList& platforms) -{ - // create execution targets - if (targetType == TypeExe) { - if (platforms.contains("winscw")) { - t << "run:" << endl; - t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; - } - t << "runonphone: sis" << endl; - t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << ".sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; - t << endl; - } -} diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h index c5b6907..9853790 100644 --- a/qmake/generators/symbian/symmake.h +++ b/qmake/generators/symbian/symmake.h @@ -129,7 +129,6 @@ protected: const QString& itemSuffix); void generateDistcleanTargets(QTextStream& t); - void generateExecutionTargets(QTextStream& t, const QStringList& platforms); // Subclass implements virtual void writeBldInfExtensionRulesPart(QTextStream& t, const QString &iconTargetFile) = 0; diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 7e3fb45..d60528b 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -409,8 +409,6 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool t << "\t$(ABLD)" << testClause << " reallyclean " << item << " urel" << endl; } t << endl; - - generateExecutionTargets(t, debugPlatforms); } void SymbianAbldMakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t, const QString &iconTargetFile) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index feacbef..c2f1d1a 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -282,8 +282,6 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << "\t$(SBS) reallyclean -c " << item << "_urel" << testClause << endl; } t << endl; - - generateExecutionTargets(t, debugPlatforms); } void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t, const QString &iconTargetFile) |