Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

qtgradienteditor can be build as all-in-one now

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-08-26 18:03:18 +00:00
parent dd4c895063
commit 3dc65db9de
9 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/KatieBuildMacros.cmake
View file

@ -171,7 +171,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
if(NOT KATIE_ALLINONE)
set(${FORTARGET}_SOURCES ${resourcesdep} ${ARGN} PARENT_SCOPE)
elseif("${FORTARGET}" MATCHES "(KtGui|KtOpenGL|KtDeclarative|KtDesigner|qtgradienteditor|shareddeviceskin)")
elseif("${FORTARGET}" MATCHES "(KtGui|KtOpenGL|KtDeclarative|KtDesigner|shareddeviceskin)")
katie_warning("All-in-one build not yet support for: ${FORTARGET}")
set(${FORTARGET}_SOURCES ${resourcesdep} ${ARGN} PARENT_SCOPE)
else()

2
src/shared/qtgradienteditor/qtcolorbutton.cpp
View file

@ -269,4 +269,4 @@ void QtColorButton::dropEvent(QDropEvent *event)
QT_END_NAMESPACE
#include <moc_qtcolorbutton.h>
#include "moc_qtcolorbutton.h"

2
src/shared/qtgradienteditor/qtgradientdialog.cpp
View file

@ -53,7 +53,7 @@ public:
void slotAboutToShowDetails(bool details, int extensionWidthHint);
Ui::QtGradientDialog m_ui;
Ui_QtGradientDialog m_ui;
};
void QtGradientDialogPrivate::slotAboutToShowDetails(bool details, int extensionWidthHint)

2
src/shared/qtgradienteditor/qtgradienteditor.cmake
View file

@ -32,7 +32,6 @@ set(SHAREDGRADIENDEDITOR_SOURCES
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientmanager.cpp
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientutils.cpp
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradienteditor.qrc
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorbutton.cpp
)
set(SHAREDGRADIENDEDITOR_HEADERS
@ -48,7 +47,6 @@ set(SHAREDGRADIENDEDITOR_HEADERS
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientviewdialog.h
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientmanager.h
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientutils.h
${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorbutton.h
)
katie_setup_target(sharedqtgradienteditor ${SHAREDGRADIENDEDITOR_SOURCES} ${SHAREDGRADIENDEDITOR_HEADERS})

2
src/shared/qtgradienteditor/qtgradienteditor.cpp
View file

@ -102,7 +102,7 @@ public:
QGradient gradient() const;
void updateGradient(bool emitSignal);
Ui::QtGradientEditor m_ui;
Ui_QtGradientEditor m_ui;
QtGradientStopsController *m_gradientStopsController;
QDoubleSpinBox *startLinearXSpinBox;

4
src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
View file

@ -93,7 +93,7 @@ public:
QtGradientStopsModel *m_model;
QColor::Spec m_spec;
Ui::QtGradientEditor *m_ui;
Ui_QtGradientEditor *m_ui;
};
void QtGradientStopsControllerPrivate::enableCurrent(bool enable)
@ -597,7 +597,7 @@ QtGradientStopsController::QtGradientStopsController(QObject *parent)
d_ptr->m_spec = QColor::Hsv;
}
void QtGradientStopsController::setUi(Ui::QtGradientEditor *ui)
void QtGradientStopsController::setUi(Ui_QtGradientEditor *ui)
{
d_ptr->m_ui = ui;

6
src/shared/qtgradienteditor/qtgradientstopscontroller.h
View file

@ -46,9 +46,7 @@
QT_BEGIN_NAMESPACE
namespace Ui {
class QtGradientEditor;
}
class Ui_QtGradientEditor;
class QtGradientStopsController : public QObject
{
@ -57,7 +55,7 @@ public:
QtGradientStopsController(QObject *parent = 0);
~QtGradientStopsController();
void setUi(Ui::QtGradientEditor *editor);
void setUi(Ui_QtGradientEditor *editor);
void setGradientStops(const QGradientStops &stops);
QGradientStops gradientStops() const;

2
src/shared/qtgradienteditor/qtgradientview.h
View file

@ -91,7 +91,7 @@ private:
QAction *m_removeAction;
QtGradientManager *m_manager;
Ui::QtGradientView m_ui;
Ui_QtGradientView m_ui;
};
QT_END_NAMESPACE

2
src/shared/qtgradienteditor/qtgradientviewdialog.h
View file

@ -66,7 +66,7 @@ private slots:
void slotGradientActivated(const QString &id);
private:
Ui::QtGradientViewDialog m_ui;
Ui_QtGradientViewDialog m_ui;
};
QT_END_NAMESPACE