diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 16:33:37 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-01 12:09:33 +0200 |
| commit | 67afac53feda6b05edf7a17dd506d378500ba9ae (patch) | |
| tree | aabef27f30acbb62c2d0b22e826e4b1cb29cd19a /src/designer/src/designer | |
| parent | 092f23cdacb5dd0ad2307cd4c18546054f7f5245 (diff) | |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I84f5fc4eb26f95d81ce5b5b8cc72706bb9185026
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/designer/src/designer')
| -rw-r--r-- | src/designer/src/designer/.prev_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/designer/src/designer/CMakeLists.txt | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/designer/src/designer/.prev_CMakeLists.txt b/src/designer/src/designer/.prev_CMakeLists.txt index c1933a92f..0437ab492 100644 --- a/src/designer/src/designer/.prev_CMakeLists.txt +++ b/src/designer/src/designer/.prev_CMakeLists.txt @@ -51,7 +51,7 @@ set(designer_resource_files "images/designer.png" ) -qt_add_resource(designer "designer" +qt_internal_add_resource(designer "designer" PREFIX "/qt-project.org/designer" FILES @@ -84,7 +84,7 @@ set(qttoolbardialog_resource_files "images/up.png" ) -qt_add_resource(designer "qttoolbardialog" +qt_internal_add_resource(designer "qttoolbardialog" PREFIX "/qt-project.org/qttoolbardialog" BASE @@ -100,12 +100,12 @@ set_target_properties(designer PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(designer CONDITION TARGET Qt::PrintSupport +qt_internal_extend_target(designer CONDITION TARGET Qt::PrintSupport PUBLIC_LIBRARIES Qt::PrintSupport ) -qt_extend_target(designer CONDITION QT_CONFIG___contains___static +qt_internal_extend_target(designer CONDITION QT_CONFIG___contains___static DEFINES QT_DESIGNER_STATIC ) @@ -148,11 +148,11 @@ endif() # FILETYPES.path = "Contents/Resources" # QMAKE_BUNDLE_DATA = "FILETYPES" -qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS +qt_internal_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS PUBLIC_LIBRARIES m ) -qt_add_docs(designer +qt_internal_add_docs(designer doc/qtdesigner.qdocconf ) diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt index cc938f58d..5de06465d 100644 --- a/src/designer/src/designer/CMakeLists.txt +++ b/src/designer/src/designer/CMakeLists.txt @@ -51,7 +51,7 @@ set(designer_resource_files "images/designer.png" ) -qt_add_resource(designer "designer" +qt_internal_add_resource(designer "designer" PREFIX "/qt-project.org/designer" FILES @@ -84,7 +84,7 @@ set(qttoolbardialog_resource_files "images/up.png" ) -qt_add_resource(designer "qttoolbardialog" +qt_internal_add_resource(designer "qttoolbardialog" PREFIX "/qt-project.org/qttoolbardialog" BASE @@ -100,12 +100,12 @@ set_target_properties(designer PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(designer CONDITION TARGET Qt::PrintSupport +qt_internal_extend_target(designer CONDITION TARGET Qt::PrintSupport PUBLIC_LIBRARIES Qt::PrintSupport ) -qt_extend_target(designer CONDITION QT_CONFIG___contains___static +qt_internal_extend_target(designer CONDITION QT_CONFIG___contains___static DEFINES QT_DESIGNER_STATIC ) @@ -156,11 +156,11 @@ endif() # FILETYPES.path = "Contents/Resources" # QMAKE_BUNDLE_DATA = "FILETYPES" -qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS +qt_internal_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS PUBLIC_LIBRARIES m ) -qt_add_docs(designer +qt_internal_add_docs(designer doc/qtdesigner.qdocconf ) |