diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 00:54:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 00:54:11 (GMT) |
| commit | c8e35e754ba70f587709af2e5dd87208a6976887 (patch) | |
| tree | 71b892fdaab289778ab874d2ec2bf483b37eb894 /tests/auto/qmake/testdata | |
| parent | ceb068261e326f38b4049becd75c7160a6b84f87 (diff) | |
| parent | bf141a24864e48e997ea3b626ad25bf5b232c2fb (diff) | |
| download | Qt-c8e35e754ba70f587709af2e5dd87208a6976887.zip Qt-c8e35e754ba70f587709af2e5dd87208a6976887.tar.gz Qt-c8e35e754ba70f587709af2e5dd87208a6976887.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:
Added license headers to new files.
use intel linker and librarian with icc
create missing output directories for substituted files
fix shadow builds with scratchbox
QMake/Win32/MinGW: Fix ar script generating with absolute paths
Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac
Crash in QX11PaintEngine::drawPixmap
Revert "Fix the rendering of lines with the X11 paint engine"
Revert "Outline / fill inconsistency in X11 paint engine."
Diffstat (limited to 'tests/auto/qmake/testdata')
| -rw-r--r-- | tests/auto/qmake/testdata/substitutes/test.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qmake/testdata/substitutes/test.pro b/tests/auto/qmake/testdata/substitutes/test.pro index 5bce312..ddad93f 100644 --- a/tests/auto/qmake/testdata/substitutes/test.pro +++ b/tests/auto/qmake/testdata/substitutes/test.pro @@ -1,2 +1 @@ -QMAKE_SUBSTITUTES += test.in -# doesn't work for the time being: sub/test2.in +QMAKE_SUBSTITUTES += test.in sub/test2.in |