[auth] Fix missing resources from the oauth2 authentication method

qgis · Dec 20, 2021 · e007a53 · e007a53
1 parent b4bc486
commit e007a53
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/auth/oauth2/CMakeLists.txt b/src/auth/oauth2/CMakeLists.txt
@@ -97,7 +97,7 @@ if(WITH_INTERNAL_O2 AND CMAKE_GENERATOR MATCHES "Ninja")
 endif()
 
 # static library
-add_library(authmethod_oauth2_a STATIC ${AUTH_OAUTH2_SRCS} ${AUTH_OAUTH2_HDRS} ${AUTH_OAUTH2_UIS_H})
+add_library(authmethod_oauth2_a STATIC ${AUTH_OAUTH2_SRCS} ${AUTH_OAUTH2_HDRS} ${AUTH_OAUTH2_RCCS} ${AUTH_OAUTH2_UIS_H})
 
 target_include_directories(authmethod_oauth2_a PUBLIC ${CMAKE_SOURCE_DIR}/src/auth/oauth2/core)
 
@@ -136,7 +136,7 @@ if (FORCE_STATIC_LIBS)
   install (TARGETS authmethod_oauth2_a ARCHIVE DESTINATION ${QGIS_PLUGIN_DIR})
 else()
   # dynamically loaded module
-  add_library(authmethod_oauth2 MODULE ${AUTH_OAUTH2_SRCS} ${AUTH_OAUTH2_HDRS} ${AUTH_OAUTH2_UIS_H})
+  add_library(authmethod_oauth2 MODULE ${AUTH_OAUTH2_SRCS} ${AUTH_OAUTH2_HDRS} ${AUTH_OAUTH2_RCCS} ${AUTH_OAUTH2_UIS_H})
 
   target_include_directories(authmethod_oauth2 PRIVATE
     ${CMAKE_SOURCE_DIR}/external/qjsonwrapper

diff --git a/src/auth/oauth2/gui/qgsauthoauth2edit.cpp b/src/auth/oauth2/gui/qgsauthoauth2edit.cpp
@@ -83,7 +83,7 @@ void QgsAuthOAuth2Edit::initGui()
   btnTokenClear->setMaximumHeight( 20 );
   btnTokenClear->setText( tr( "Tokens" ) );
   btnTokenClear->setToolTip( tr( "Remove cached tokens" ) );
-  btnTokenClear->setIcon( QIcon( QStringLiteral( ":/oauth2method/oauth2_resources/close.svg" ) ) );
+  btnTokenClear->setIcon( QIcon( QStringLiteral( ":/oauth2method/svg/close.svg" ) ) );
   btnTokenClear->setIconSize( QSize( 12, 12 ) );
   btnTokenClear->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
   btnTokenClear->setEnabled( hasTokenCacheFile() );

diff --git a/src/auth/oauth2/gui/qgsauthoauth2edit.ui b/src/auth/oauth2/gui/qgsauthoauth2edit.ui
@@ -158,7 +158,7 @@
                </property>
                <property name="icon">
                 <iconset resource="oauth2_resources.qrc">
-                 <normaloff>:/oauth2method/oauth2_resources/export.svg</normaloff>:/oauth2method/oauth2_resources/export.svg</iconset>
+                 <normaloff>:/oauth2method/svg/export.svg</normaloff>:/oauth2method/svg/export.svg</iconset>
                </property>
                <property name="iconSize">
                 <size>
@@ -178,7 +178,7 @@
                </property>
                <property name="icon">
                 <iconset resource="oauth2_resources.qrc">
-                 <normaloff>:/oauth2method/oauth2_resources/import.svg</normaloff>:/oauth2method/oauth2_resources/import.svg</iconset>
+                 <normaloff>:/oauth2method/svg/import.svg</normaloff>:/oauth2method/svg/import.svg</iconset>
                </property>
               </widget>
              </item>
@@ -735,7 +735,7 @@
             </property>
             <property name="icon">
              <iconset resource="oauth2_resources.qrc">
-              <normaloff>:/oauth2method/oauth2_resources/fileopen.svg</normaloff>:/oauth2method/oauth2_resources/fileopen.svg</iconset>
+              <normaloff>:/oauth2method/svg/fileopen.svg</normaloff>:/oauth2method/svg/fileopen.svg</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -783,7 +783,7 @@
             </property>
             <property name="icon">
              <iconset resource="oauth2_resources.qrc">
-              <normaloff>:/oauth2method/oauth2_resources/fileopen.svg</normaloff>:/oauth2method/oauth2_resources/fileopen.svg</iconset>
+              <normaloff>:/oauth2method/svg/fileopen.svg</normaloff>:/oauth2method/svg/fileopen.svg</iconset>
             </property>
            </widget>
           </item>