diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-07-27 16:43:20 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-08-04 08:06:41 +0000 |
commit | 0aaefe74eef7444d093fa6b54b29bb1630777360 (patch) | |
tree | 8982493e9b7e84ef1185a77ef9e51fd1ed5fe2f9 /examples | |
parent | 57bc6d8d9613f257b899fe8b94660142d4f91c07 (diff) |
Remove `import qbs` from all project files
... because we don't need in this inclusion at all.
But for some cases it is impossible to remove that inclusions
(and even to move on next lines) because then the some tests
are failed by unknown reason. For those tests were added the
following comments on the inclusion lines:
`// FIXME: Don't remove this import because then the test fails!`
Change-Id: I9153fd0e38b94af08168e499ee46a23889ee4d73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'examples')
39 files changed, 0 insertions, 75 deletions
diff --git a/examples/app-and-lib/app-and-lib.qbs b/examples/app-and-lib/app-and-lib.qbs index baa42307f..8170f37a2 100644 --- a/examples/app-and-lib/app-and-lib.qbs +++ b/examples/app-and-lib/app-and-lib.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs 1.0 - Project { references: [ "app/app.qbs", diff --git a/examples/app-and-lib/app/app.qbs b/examples/app-and-lib/app/app.qbs index e94391877..dcb9e7af2 100644 --- a/examples/app-and-lib/app/app.qbs +++ b/examples/app-and-lib/app/app.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs 1.0 - Application { consoleApplication: true files : [ "main.cpp" ] diff --git a/examples/app-and-lib/lib/lib.qbs b/examples/app-and-lib/lib/lib.qbs index b67ba9ba6..a5fbc6fb8 100644 --- a/examples/app-and-lib/lib/lib.qbs +++ b/examples/app-and-lib/lib/lib.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs 1.0 - StaticLibrary { name: "mylib" files: [ diff --git a/examples/baremetal/at90can128olimex/at90can128olimex.qbs b/examples/baremetal/at90can128olimex/at90can128olimex.qbs index dc1760fe9..2c206f7cc 100644 --- a/examples/baremetal/at90can128olimex/at90can128olimex.qbs +++ b/examples/baremetal/at90can128olimex/at90can128olimex.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for Olimex AVR-CAN board" references: [ diff --git a/examples/baremetal/at90can128olimex/redblink/redblink.qbs b/examples/baremetal/at90can128olimex/redblink/redblink.qbs index 84323e3c1..afdbe46f7 100644 --- a/examples/baremetal/at90can128olimex/redblink/redblink.qbs +++ b/examples/baremetal/at90can128olimex/redblink/redblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.contains("avr")) diff --git a/examples/baremetal/baremetal.qbs b/examples/baremetal/baremetal.qbs index 82e913a4f..0d71968b6 100644 --- a/examples/baremetal/baremetal.qbs +++ b/examples/baremetal/baremetal.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "BareMetal" references: [ diff --git a/examples/baremetal/cc2540usbdongle/cc2540usbdongle.qbs b/examples/baremetal/cc2540usbdongle/cc2540usbdongle.qbs index 52e1948eb..6cb99e6a4 100644 --- a/examples/baremetal/cc2540usbdongle/cc2540usbdongle.qbs +++ b/examples/baremetal/cc2540usbdongle/cc2540usbdongle.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for cc2540usbdongle board" references: [ diff --git a/examples/baremetal/cc2540usbdongle/greenblink/greenblink.qbs b/examples/baremetal/cc2540usbdongle/greenblink/greenblink.qbs index e8aa3d1fd..d1d3281a9 100644 --- a/examples/baremetal/cc2540usbdongle/greenblink/greenblink.qbs +++ b/examples/baremetal/cc2540usbdongle/greenblink/greenblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.contains("mcs51")) diff --git a/examples/baremetal/cy7c68013a/cy7c68013a.qbs b/examples/baremetal/cy7c68013a/cy7c68013a.qbs index 370844725..dca261d70 100644 --- a/examples/baremetal/cy7c68013a/cy7c68013a.qbs +++ b/examples/baremetal/cy7c68013a/cy7c68013a.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for cy7c68013a board" references: [ diff --git a/examples/baremetal/cy7c68013a/nes-gamepads/nes-gamepads.qbs b/examples/baremetal/cy7c68013a/nes-gamepads/nes-gamepads.qbs index 0d7994033..81566ff96 100644 --- a/examples/baremetal/cy7c68013a/nes-gamepads/nes-gamepads.qbs +++ b/examples/baremetal/cy7c68013a/nes-gamepads/nes-gamepads.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.contains("mcs51")) diff --git a/examples/baremetal/esp8266/access-point/access-point.qbs b/examples/baremetal/esp8266/access-point/access-point.qbs index fd2890fbd..e9b06c340 100644 --- a/examples/baremetal/esp8266/access-point/access-point.qbs +++ b/examples/baremetal/esp8266/access-point/access-point.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: qbs.toolchain.contains("gcc") && qbs.architecture === "xtensa" diff --git a/examples/baremetal/esp8266/esp8266.qbs b/examples/baremetal/esp8266/esp8266.qbs index 6056a33e0..faa74434e 100644 --- a/examples/baremetal/esp8266/esp8266.qbs +++ b/examples/baremetal/esp8266/esp8266.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for esp8266-wroom-02 board" qbsSearchPaths: "qbs" diff --git a/examples/baremetal/esp8266/qbs/modules/esp8266_sdk/Esp8266SdkModule.qbs b/examples/baremetal/esp8266/qbs/modules/esp8266_sdk/Esp8266SdkModule.qbs index ba7cbbe44..57e1f8572 100644 --- a/examples/baremetal/esp8266/qbs/modules/esp8266_sdk/Esp8266SdkModule.qbs +++ b/examples/baremetal/esp8266/qbs/modules/esp8266_sdk/Esp8266SdkModule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } diff --git a/examples/baremetal/msp430f5529/msp430f5529.qbs b/examples/baremetal/msp430f5529/msp430f5529.qbs index f4a6f95b9..64e62dd57 100644 --- a/examples/baremetal/msp430f5529/msp430f5529.qbs +++ b/examples/baremetal/msp430f5529/msp430f5529.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for msp430f5529 board" references: [ diff --git a/examples/baremetal/msp430f5529/nes-gamepads/nes-gamepads.qbs b/examples/baremetal/msp430f5529/nes-gamepads/nes-gamepads.qbs index 37dfe8ca6..a06cfc6a2 100644 --- a/examples/baremetal/msp430f5529/nes-gamepads/nes-gamepads.qbs +++ b/examples/baremetal/msp430f5529/nes-gamepads/nes-gamepads.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.contains("msp430")) diff --git a/examples/baremetal/msp430f5529/redblink/redblink.qbs b/examples/baremetal/msp430f5529/redblink/redblink.qbs index 0f056e101..d89d307a9 100644 --- a/examples/baremetal/msp430f5529/redblink/redblink.qbs +++ b/examples/baremetal/msp430f5529/redblink/redblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.contains("msp430")) diff --git a/examples/baremetal/pca10001/greenblink/greenblink.qbs b/examples/baremetal/pca10001/greenblink/greenblink.qbs index f5e4c3cc1..1a4dabde7 100644 --- a/examples/baremetal/pca10001/greenblink/greenblink.qbs +++ b/examples/baremetal/pca10001/greenblink/greenblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) diff --git a/examples/baremetal/pca10001/pca10001.qbs b/examples/baremetal/pca10001/pca10001.qbs index fc5c4d190..db1303268 100644 --- a/examples/baremetal/pca10001/pca10001.qbs +++ b/examples/baremetal/pca10001/pca10001.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for pca10001/pca10024 boards" references: [ diff --git a/examples/baremetal/pca10040/greenblink/greenblink.qbs b/examples/baremetal/pca10040/greenblink/greenblink.qbs index dcf9c388f..2ae3dc2a1 100644 --- a/examples/baremetal/pca10040/greenblink/greenblink.qbs +++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) diff --git a/examples/baremetal/pca10040/pca10040.qbs b/examples/baremetal/pca10040/pca10040.qbs index caceae0b6..e5e516c3f 100644 --- a/examples/baremetal/pca10040/pca10040.qbs +++ b/examples/baremetal/pca10040/pca10040.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for pca10040 board" references: [ diff --git a/examples/baremetal/stm32f103/greenblink/greenblink.qbs b/examples/baremetal/stm32f103/greenblink/greenblink.qbs index d925344fb..18fe8e536 100644 --- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs +++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) diff --git a/examples/baremetal/stm32f103/stm32f103.qbs b/examples/baremetal/stm32f103/stm32f103.qbs index bb5ab33e7..705502c52 100644 --- a/examples/baremetal/stm32f103/stm32f103.qbs +++ b/examples/baremetal/stm32f103/stm32f103.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for stm32f103 board" references: [ diff --git a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs index 4a89cf684..f2e1dfcc9 100644 --- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs +++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) diff --git a/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs b/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs index a402848ca..cbb3bdc3a 100644 --- a/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs +++ b/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for stm32f4discovery board" references: [ diff --git a/examples/baremetal/stm8s103f3/redblink/redblink.qbs b/examples/baremetal/stm8s103f3/redblink/redblink.qbs index 197bae8ae..c01f323cd 100644 --- a/examples/baremetal/stm8s103f3/redblink/redblink.qbs +++ b/examples/baremetal/stm8s103f3/redblink/redblink.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { if (!qbs.architecture.contains("stm8")) diff --git a/examples/baremetal/stm8s103f3/stm8s103f3.qbs b/examples/baremetal/stm8s103f3/stm8s103f3.qbs index 922c4c1f0..cfbfc87a8 100644 --- a/examples/baremetal/stm8s103f3/stm8s103f3.qbs +++ b/examples/baremetal/stm8s103f3/stm8s103f3.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for stm8s103f3 board" references: [ diff --git a/examples/cocoa-application/cocoa-application.qbs b/examples/cocoa-application/cocoa-application.qbs index 472758764..9c1ad1370 100644 --- a/examples/cocoa-application/cocoa-application.qbs +++ b/examples/cocoa-application/cocoa-application.qbs @@ -49,7 +49,6 @@ ** ****************************************************************************/ -import qbs import qbs.Utilities Project { diff --git a/examples/cocoa-application/dmg.qbs b/examples/cocoa-application/dmg.qbs index 0f5d3587b..0ae68b297 100644 --- a/examples/cocoa-application/dmg.qbs +++ b/examples/cocoa-application/dmg.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - AppleApplicationDiskImage { condition: qbs.targetOS.contains("macos") name: "Cocoa Application DMG" diff --git a/examples/cocoa-touch-application/cocoa-touch-application.qbs b/examples/cocoa-touch-application/cocoa-touch-application.qbs index bf2fb4080..ec199d4a5 100644 --- a/examples/cocoa-touch-application/cocoa-touch-application.qbs +++ b/examples/cocoa-touch-application/cocoa-touch-application.qbs @@ -49,8 +49,6 @@ ** ****************************************************************************/ -import qbs 1.0 - CppApplication { Depends { name: "xcode"; required: false } Depends { condition: product.condition; name: "ib" } diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs index f17c13095..4d664c0ec 100644 --- a/examples/code-generator/code-generator.qbs +++ b/examples/code-generator/code-generator.qbs @@ -47,7 +47,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import qbs Project { // A code generator that outputs a "Hello World" C++ program. diff --git a/examples/collidingmice/collidingmice.qbs b/examples/collidingmice/collidingmice.qbs index 52231882e..8f93a3230 100644 --- a/examples/collidingmice/collidingmice.qbs +++ b/examples/collidingmice/collidingmice.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs 1.0 - CppApplication { name : "CollidingMice" Depends { name: "Qt.widgets" } diff --git a/examples/compiled-qml/compiled-qml.qbs b/examples/compiled-qml/compiled-qml.qbs index 3a900fac9..5d5dd3a8c 100644 --- a/examples/compiled-qml/compiled-qml.qbs +++ b/examples/compiled-qml/compiled-qml.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { Depends { name: "Qt.quick" } diff --git a/examples/examples.qbs b/examples/examples.qbs index 18205d67a..d457b8a88 100644 --- a/examples/examples.qbs +++ b/examples/examples.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { references: [ "app-and-lib/app-and-lib.qbs", diff --git a/examples/helloworld-complex/helloworld-complex.qbs b/examples/helloworld-complex/helloworld-complex.qbs index 16e7eace0..fab3fd516 100644 --- a/examples/helloworld-complex/helloworld-complex.qbs +++ b/examples/helloworld-complex/helloworld-complex.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs 1.0 - Project { property bool hasSpecialFeature: true Application { diff --git a/examples/helloworld-minimal/helloworld-minimal.qbs b/examples/helloworld-minimal/helloworld-minimal.qbs index 5cad9f4bf..40149d01f 100644 --- a/examples/helloworld-minimal/helloworld-minimal.qbs +++ b/examples/helloworld-minimal/helloworld-minimal.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { name: "HelloWorld-minimal" files: "main.cpp" diff --git a/examples/helloworld-qt/helloworld-qt.qbs b/examples/helloworld-qt/helloworld-qt.qbs index 4c6e070af..8d8b6e493 100644 --- a/examples/helloworld-qt/helloworld-qt.qbs +++ b/examples/helloworld-qt/helloworld-qt.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - QtApplication { name: "HelloWorld-Qt" files: "main.cpp" diff --git a/examples/install-bundle/install-bundle.qbs b/examples/install-bundle/install-bundle.qbs index 9cd856dbd..cedfc2105 100644 --- a/examples/install-bundle/install-bundle.qbs +++ b/examples/install-bundle/install-bundle.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs index f01ca47f2..51bc386d6 100644 --- a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs +++ b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true condition: protobuf.cpp.present && qbs.targetPlatform === qbs.hostPlatform diff --git a/examples/protobuf/addressbook_objc/addressbook_objc.qbs b/examples/protobuf/addressbook_objc/addressbook_objc.qbs index fe819d77a..a573b9015 100644 --- a/examples/protobuf/addressbook_objc/addressbook_objc.qbs +++ b/examples/protobuf/addressbook_objc/addressbook_objc.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true condition: protobuf.objc.present && qbs.targetOS.contains("macos") |