diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /examples/richtext/calendar/calendar.pro | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'examples/richtext/calendar/calendar.pro')
| -rw-r--r-- | examples/richtext/calendar/calendar.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro index f65e8852bd..3867a027cf 100644 --- a/examples/richtext/calendar/calendar.pro +++ b/examples/richtext/calendar/calendar.pro @@ -2,8 +2,6 @@ HEADERS = mainwindow.h SOURCES = main.cpp \ mainwindow.cpp -# App cannot be with name "calendar" in Symbian due to same named system component. - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro |