diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 08:23:07 +0200 |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 08:23:07 +0200 |
commit | 57ceb11ecf95032418712a686418116cf2398e7a (patch) | |
tree | 378533fcc07983d3a1b461aaaad07d842e50b81c /demos | |
parent | 90d4366f1e9657b3240a872698614c7d9747f9e0 (diff) | |
parent | a4fc85c75f068b73f9c2334c77b0ae2275510e17 (diff) |
Merge commit 'origin/master'
Conflicts:
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
tests/auto/qfontdialog/tst_qfontdialog.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
tests/auto/qsqldriver/qsqldriver.pro
tests/auto/qsqlquery/qsqlquery.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qstatemachine/tst_qstatemachine.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
Diffstat (limited to 'demos')
-rw-r--r-- | demos/chip/chip.pro | 1 | ||||
-rw-r--r-- | demos/demobase.pri | 4 | ||||
-rw-r--r-- | demos/interview/interview.pro | 1 | ||||
-rw-r--r-- | demos/mainwindow/mainwindow.pro | 1 | ||||
-rw-r--r-- | demos/spreadsheet/spreadsheet.pro | 1 | ||||
-rw-r--r-- | demos/textedit/textedit.pro | 1 | ||||
-rw-r--r-- | demos/undo/undo.pro | 1 |
7 files changed, 2 insertions, 8 deletions
diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro index 2c44e56f08..a24a634387 100644 --- a/demos/chip/chip.pro +++ b/demos/chip/chip.pro @@ -18,4 +18,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/chip INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) - diff --git a/demos/demobase.pri b/demos/demobase.pri index 724f64b131..9ec8fe9e71 100644 --- a/demos/demobase.pri +++ b/demos/demobase.pri @@ -1,6 +1,6 @@ symbian {
- RSS_RULES ="group_name=\"QtDemos\";"
-
+ RSS_RULES ="group_name=\"QtDemos\";"
+
vendorinfo = \
"; Localised Vendor name" \
"%{\"Nokia, Qt Software\"}" \
diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro index 19b2ca81dc..0faa21ff47 100644 --- a/demos/interview/interview.pro +++ b/demos/interview/interview.pro @@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/interview INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) - diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro index 6e7d784e3b..87b42becbe 100644 --- a/demos/mainwindow/mainwindow.pro +++ b/demos/mainwindow/mainwindow.pro @@ -15,4 +15,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/mainwindow INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) - diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro index 5cf251a7d2..102b75d02f 100644 --- a/demos/spreadsheet/spreadsheet.pro +++ b/demos/spreadsheet/spreadsheet.pro @@ -32,4 +32,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) - diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro index 6f15e70e2a..8b29a456c5 100644 --- a/demos/textedit/textedit.pro +++ b/demos/textedit/textedit.pro @@ -20,4 +20,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/textedit INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) - diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro index bf7017bf9f..a4257cd1c7 100644 --- a/demos/undo/undo.pro +++ b/demos/undo/undo.pro @@ -16,4 +16,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/undo INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) - |