qgis · Aug 30, 2015
diff --git a/‎src/ui/CMakeLists.txt
Lines changed: 2 additions & 1 deletion b/‎src/ui/CMakeLists.txt
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/ui/qgsatlascompositionwidgetbase.ui renamed to ‎src/ui/composer/qgsatlascompositionwidgetbase.ui b/‎src/ui/qgsatlascompositionwidgetbase.ui renamed to ‎src/ui/composer/qgsatlascompositionwidgetbase.ui
diff --git a/‎src/ui/qgsattributeselectiondialogbase.ui renamed to ‎src/ui/composer/qgsattributeselectiondialogbase.ui b/‎src/ui/qgsattributeselectiondialogbase.ui renamed to ‎src/ui/composer/qgsattributeselectiondialogbase.ui
diff --git a/‎src/ui/qgscomposerarrowwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerarrowwidgetbase.ui b/‎src/ui/qgscomposerarrowwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerarrowwidgetbase.ui
diff --git a/‎src/ui/qgscomposerattributetablewidgetbase.ui renamed to ‎src/ui/composer/qgscomposerattributetablewidgetbase.ui b/‎src/ui/qgscomposerattributetablewidgetbase.ui renamed to ‎src/ui/composer/qgscomposerattributetablewidgetbase.ui
diff --git a/‎src/ui/qgscomposerbase.ui renamed to ‎src/ui/composer/qgscomposerbase.ui b/‎src/ui/qgscomposerbase.ui renamed to ‎src/ui/composer/qgscomposerbase.ui
diff --git a/‎src/ui/qgscomposerhtmlwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerhtmlwidgetbase.ui b/‎src/ui/qgscomposerhtmlwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerhtmlwidgetbase.ui
diff --git a/‎src/ui/qgscomposeritemwidgetbase.ui renamed to ‎src/ui/composer/qgscomposeritemwidgetbase.ui b/‎src/ui/qgscomposeritemwidgetbase.ui renamed to ‎src/ui/composer/qgscomposeritemwidgetbase.ui
diff --git a/‎src/ui/qgscomposerlabelwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerlabelwidgetbase.ui b/‎src/ui/qgscomposerlabelwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerlabelwidgetbase.ui
diff --git a/‎src/ui/qgscomposerlegenditemdialogbase.ui renamed to ‎src/ui/composer/qgscomposerlegenditemdialogbase.ui b/‎src/ui/qgscomposerlegenditemdialogbase.ui renamed to ‎src/ui/composer/qgscomposerlegenditemdialogbase.ui
diff --git a/‎src/ui/qgscomposerlegendlayersdialogbase.ui renamed to ‎src/ui/composer/qgscomposerlegendlayersdialogbase.ui b/‎src/ui/qgscomposerlegendlayersdialogbase.ui renamed to ‎src/ui/composer/qgscomposerlegendlayersdialogbase.ui
diff --git a/‎src/ui/qgscomposerlegendwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerlegendwidgetbase.ui b/‎src/ui/qgscomposerlegendwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerlegendwidgetbase.ui
diff --git a/‎src/ui/qgscomposermanagerbase.ui renamed to ‎src/ui/composer/qgscomposermanagerbase.ui b/‎src/ui/qgscomposermanagerbase.ui renamed to ‎src/ui/composer/qgscomposermanagerbase.ui
diff --git a/‎src/ui/qgscomposermapwidgetbase.ui renamed to ‎src/ui/composer/qgscomposermapwidgetbase.ui b/‎src/ui/qgscomposermapwidgetbase.ui renamed to ‎src/ui/composer/qgscomposermapwidgetbase.ui
diff --git a/‎src/ui/qgscomposerpicturewidgetbase.ui renamed to ‎src/ui/composer/qgscomposerpicturewidgetbase.ui b/‎src/ui/qgscomposerpicturewidgetbase.ui renamed to ‎src/ui/composer/qgscomposerpicturewidgetbase.ui
diff --git a/‎src/ui/qgscomposerscalebarwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerscalebarwidgetbase.ui b/‎src/ui/qgscomposerscalebarwidgetbase.ui renamed to ‎src/ui/composer/qgscomposerscalebarwidgetbase.ui
diff --git a/‎src/ui/qgscomposershapewidgetbase.ui renamed to ‎src/ui/composer/qgscomposershapewidgetbase.ui b/‎src/ui/qgscomposershapewidgetbase.ui renamed to ‎src/ui/composer/qgscomposershapewidgetbase.ui
diff --git a/‎src/ui/qgscomposertablewidgetbase.ui renamed to ‎src/ui/composer/qgscomposertablewidgetbase.ui b/‎src/ui/qgscomposertablewidgetbase.ui renamed to ‎src/ui/composer/qgscomposertablewidgetbase.ui
diff --git a/‎src/ui/qgscomposervectorlegendbase.ui renamed to ‎src/ui/composer/qgscomposervectorlegendbase.ui b/‎src/ui/qgscomposervectorlegendbase.ui renamed to ‎src/ui/composer/qgscomposervectorlegendbase.ui
diff --git a/‎src/ui/qgscompositionbase.ui renamed to ‎src/ui/composer/qgscompositionbase.ui b/‎src/ui/qgscompositionbase.ui renamed to ‎src/ui/composer/qgscompositionbase.ui
diff --git a/‎src/ui/qgscompositionwidgetbase.ui renamed to ‎src/ui/composer/qgscompositionwidgetbase.ui b/‎src/ui/qgscompositionwidgetbase.ui renamed to ‎src/ui/composer/qgscompositionwidgetbase.ui
@@ -3,8 +3,9 @@ FILE(GLOB QGIS_UIS "${CMAKE_CURRENT_SOURCE_DIR}/*.ui")
 FILE(GLOB SYMBOLLAYER_UIS "${CMAKE_CURRENT_SOURCE_DIR}/symbollayer/*.ui")
 FILE(GLOB EDITORWIDGET_UIS "${CMAKE_CURRENT_SOURCE_DIR}/editorwidgets/*.ui")
 FILE(GLOB PAINTEFFECT_UIS "${CMAKE_CURRENT_SOURCE_DIR}/effects/*.ui")
+FILE(GLOB COMPOSER_UIS "${CMAKE_CURRENT_SOURCE_DIR}/composer/*.ui")
 
-QT4_WRAP_UI(QGIS_UIS_H ${QGIS_UIS} ${SYMBOLLAYER_UIS} ${EDITORWIDGET_UIS} ${PAINTEFFECT_UIS})
+QT4_WRAP_UI(QGIS_UIS_H ${QGIS_UIS} ${SYMBOLLAYER_UIS} ${EDITORWIDGET_UIS} ${PAINTEFFECT_UIS} ${COMPOSER_UIS})
 
 ADD_CUSTOM_TARGET(ui ALL DEPENDS ${QGIS_UIS_H})