diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro | 16 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qpluginloader/machtest/stub.cpp | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro index 8daa343e2b..9c34a873bc 100644 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro @@ -20,19 +20,25 @@ fat_no_x86_64.target = good.fat.no-x86_64.dylib fat_no_x86_64.commands = lipo -create -output $@ -arch i386 good.i386.dylib -arch ppc64 good.ppc64.dylib fat_no_x86_64.depends += good.i386.dylib good.ppc64.dylib +stub_i386.commands = $$QMAKE_CXX -shared -arch i386 -o stub.i386.dylib $$PWD/stub.cpp +stub_i386.depends += $$PWD/stub.cpp + +stub_x86_64.commands = $$QMAKE_CXX -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp +stub_x86_64.depends += $$PWD/stub.cpp + fat_stub_i386.target = good.fat.stub-i386.dylib -fat_stub_i386.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch_blank i386 -fat_stub_i386.depends += good.x86_64.dylib good.ppc64.dylib +fat_stub_i386.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch i386 stub.i386.dylib +fat_stub_i386.depends += stub_i386 good.x86_64.dylib good.ppc64.dylib fat_stub_x86_64.target = good.fat.stub-x86_64.dylib -fat_stub_x86_64.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch_blank x86_64 -fat_stub_x86_64.depends += good.i386.dylib good.ppc64.dylib +fat_stub_x86_64.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch x86_64 stub.x86_64.dylib +fat_stub_x86_64.depends += stub_x86_64 good.i386.dylib good.ppc64.dylib bad.commands = $$PWD/generate-bad.pl bad.depends += $$PWD/generate-bad.pl MYTARGETS = $$fat_all.depends fat_all fat_no_x86_64 fat_no_i386 \ - fat_stub_i386 fat_stub_x86_64 bad + fat_stub_i386 fat_stub_x86_64 bad stub_i386 stub_x86_64 all.depends += $$MYTARGETS QMAKE_EXTRA_TARGETS += $$MYTARGETS all diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/stub.cpp b/tests/auto/corelib/plugin/qpluginloader/machtest/stub.cpp new file mode 100644 index 0000000000..24bac391fb --- /dev/null +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/stub.cpp @@ -0,0 +1 @@ +void dummy() {} |