diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 11:23:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 11:23:07 (GMT) |
| commit | 8f84ccc8d16383e722f07578dbfa2b15c2b24431 (patch) | |
| tree | da2c590d7071ba535c41af00fe8ba310c8303e09 /tests/auto/qmake/testdata | |
| parent | cf907cb8ab5ecb95d964762c1cce586fa2207dff (diff) | |
| parent | 6988f2bb36dafc2223c326b6fd21e49586b1379b (diff) | |
| download | Qt-8f84ccc8d16383e722f07578dbfa2b15c2b24431.zip Qt-8f84ccc8d16383e722f07578dbfa2b15c2b24431.tar.gz Qt-8f84ccc8d16383e722f07578dbfa2b15c2b24431.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
Diffstat (limited to 'tests/auto/qmake/testdata')
| -rw-r--r-- | tests/auto/qmake/testdata/simple_app/build/README | 1 | ||||
| -rw-r--r-- | tests/auto/qmake/testdata/simple_app/simple_app.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qmake/testdata/simple_app/test.qrc | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qmake/testdata/simple_app/build/README b/tests/auto/qmake/testdata/simple_app/build/README new file mode 100644 index 0000000..acfd9d9 --- /dev/null +++ b/tests/auto/qmake/testdata/simple_app/build/README @@ -0,0 +1 @@ +Here to ensure build/ exists, used by the simple_app_shadowbuild2 test. diff --git a/tests/auto/qmake/testdata/simple_app/simple_app.pro b/tests/auto/qmake/testdata/simple_app/simple_app.pro index f496d5b..a8c4ad6 100644 --- a/tests/auto/qmake/testdata/simple_app/simple_app.pro +++ b/tests/auto/qmake/testdata/simple_app/simple_app.pro @@ -3,6 +3,7 @@ CONFIG += qt warn_on HEADERS = test_file.h SOURCES = test_file.cpp \ main.cpp +RESOURCES = test.qrc TARGET = simple_app DESTDIR = ./ diff --git a/tests/auto/qmake/testdata/simple_app/test.qrc b/tests/auto/qmake/testdata/simple_app/test.qrc new file mode 100644 index 0000000..decde3d --- /dev/null +++ b/tests/auto/qmake/testdata/simple_app/test.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>test.qrc</file> + </qresource> +</RCC> |