diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:05:53 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:05:53 (GMT) |
commit | 0981f27d76436f8058d8534b7454777910922ee0 (patch) | |
tree | 780a864cb0d9b163f15dbe9d84e64bb0dfbb9110 /examples/widgets/calculator/calculator.pro | |
parent | e658bcb0e64acca9684f0897510d639af98ab552 (diff) | |
parent | 5a26fa6da1986bdb507391fd8784c51258e81d80 (diff) | |
download | Qt-0981f27d76436f8058d8534b7454777910922ee0.zip Qt-0981f27d76436f8058d8534b7454777910922ee0.tar.gz Qt-0981f27d76436f8058d8534b7454777910922ee0.tar.bz2 |
Merge commit 'origin/4.6' into mmfphonon
Conflicts:
demos/mediaplayer/mediaplayer.pro
Diffstat (limited to 'examples/widgets/calculator/calculator.pro')
-rw-r--r-- | examples/widgets/calculator/calculator.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro index 585ff43..b31208e 100644 --- a/examples/widgets/calculator/calculator.pro +++ b/examples/widgets/calculator/calculator.pro @@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/calculator INSTALLS += target sources symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.UID3 = 0xA000C602 + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) } |