diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-04 15:53:56 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-06 14:49:39 +0000 |
| commit | a685b5fc6ad7332e941240f9f879a6ac5a51f63b (patch) | |
| tree | ec88ae0666673079caf46ca139b1b50d93272d5e /tests/auto/blackbox/tst_blackboxqt.cpp | |
| parent | 867ffbb1655b86adde0c8fcdad0459f689b03a34 (diff) | |
Get rid of the ".obj" subdir in our build directories
We claim that build directories are opaque, yet there's a ".obj" subdir
where object files are placed. This needlessly adds a level in the build
dir structure. Remove the creation and usage of this directory, which is
clearly qmake legacy.
Change-Id: I3afa6bd61b76941ecebbc2cd8f4109621694e371
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index f0ec35708..501991a03 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -329,7 +329,7 @@ void TestBlackboxQt::track_qobject_change() QCOMPARE(runQbs(), 0); const QString productFilePath = relativeExecutableFilePath("i"); QVERIFY2(regularFileExists(productFilePath), qPrintable(productFilePath)); - QString moc_bla_objectFileName = relativeProductBuildDir("i") + "/.obj/" + QString moc_bla_objectFileName = relativeProductBuildDir("i") + '/' + inputDirHash("qt.headers") + objectFileName("/moc_bla.cpp", profileName()); QVERIFY2(regularFileExists(moc_bla_objectFileName), qPrintable(moc_bla_objectFileName)); |