qtproperty browser is relocated to 'external' directory, code is updated from qt-solutions's git

GUI/CMakeLists.txt

@@ -14,6 +14,7 @@ add_subdirectory(externals/qt-manhattan-style)
 add_subdirectory(externals/qcustomplot)
 add_subdirectory(externals/qt-root)
 add_subdirectory(externals/qt-root-gui-factory)
+add_subdirectory(externals/qtpropertybrowser)
 add_subdirectory(coregui)
 
 

GUI/coregui/CMakeLists.txt

@@ -18,10 +18,10 @@ set(include_dirs
     ${CMAKE_CURRENT_SOURCE_DIR}/Views
     ${CMAKE_CURRENT_SOURCE_DIR}/Views/Components/widgetbox
     ${CMAKE_CURRENT_SOURCE_DIR}/Views/Components/SampleDesigner
-    ${CMAKE_CURRENT_SOURCE_DIR}/qttools/qtpropertybrowser
+#    ${CMAKE_CURRENT_SOURCE_DIR}/qttools/qtpropertybrowser
 )
 include_directories(${include_dirs})
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # qtpropertybrowser needs some moc files
+#include_directories(${CMAKE_CURRENT_BINARY_DIR}) # qtpropertybrowser needs some moc files
 
 file(GLOB source_files
     "mainwindow/*.cpp"
@@ -30,7 +30,7 @@ file(GLOB source_files
     "Views/*.cpp"
 #    "Views/Components/widgetbox/*.cpp"
     "Views/Components/SampleDesigner/*.cpp"
-    "qttools/qtpropertybrowser/*.cpp"
+#    "qttools/qtpropertybrowser/*.cpp"
 )
 
 set(source_widgetbox
@@ -48,7 +48,7 @@ file(GLOB include_files
     "Views/*.h"
 #    "Views/Components/widgetbox/*.h"
     "Views/Components/SampleDesigner/*.h"
-    "qttools/qtpropertybrowser/*.h"
+#    "qttools/qtpropertybrowser/*.h"
 )
 
 set(include_widgetbox
@@ -63,7 +63,7 @@ list(APPEND include_files ${include_widgetbox})
 
 set(resource_files
     "coregui.qrc"
-    "qttools/qtpropertybrowser/qtpropertybrowser.qrc"
+#    "qttools/qtpropertybrowser/qtpropertybrowser.qrc"
     "Views/Components/SampleDesigner/SampleDesigner.qrc"
     "Views/Components/widgetbox/widgetbox.qrc"
 )
@@ -74,11 +74,10 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x040900)
 
 add_executable(${executable_name} ${source_files} ${RC_SRCS} ${include_files})
 
-message("YYY ${qcustomplot_INCLUDE_DIRS}}")
-
 # --- dependencies ---
 include_directories(
     ${qcustomplot_INCLUDE_DIRS}
+    ${qtpropertybrowser_INCLUDE_DIRS}
     ${GQt_INCLUDE_DIRS}
     ${QtRoot_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -89,13 +88,12 @@ include_directories(
     ${EIGEN3_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
 )
-target_link_libraries(${executable_name}
-)
 
 #core gui script webkit webkitwidgets designer designercomponents
 
 target_link_libraries(${executable_name} 
     ${qcustomplot_LIBRARY}
+    ${qtpropertybrowser_LIBRARY}
     ${GQt_LIBRARY}
     ${QtRoot_LIBRARY}
     ${Qt5Widgets_LIBRARIES}

GUI/coregui/Models/PythonScriptSampleBuilder.cpp

 #include "PythonScriptSampleBuilder.h"
 
-#include <Python.h>
-#include <boost/python.hpp>
 #include <cstring>
 #include <QByteArray>
 

GUI/coregui/Models/PythonScriptSampleBuilder.h

 #ifndef PYTHONSCRIPTSAMPLEBUILDER_H
 #define PYTHONSCRIPTSAMPLEBUILDER_H
 
+#include <Python.h>
+#include <boost/python.hpp>
+
 #include "ISampleBuilder.h"
 
 #include <QFileInfo>

GUI/coregui/Views/Components/widgetbox/filterwidget_p.h

-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Designer of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of Qt Designer.  This header
-// file may change from version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef FILTERWIDGET_H
-#define FILTERWIDGET_H
-
-#include "shared_global_p.h"
-
-//#include <QtWidgets/QWidget>
-//#include <QtWidgets/QLineEdit>
-//#include <QtGui/QColor>
-//#include <QtWidgets/QToolButton>
-
-#include <QWidget>
-#include <QLineEdit>
-#include <QColor>
-#include <QToolButton>
-
-
-QT_BEGIN_NAMESPACE
-
-class QToolButton;
-
-namespace qdesigner_internal {
-
-/* This widget should never have initial focus
- * (ie, be the first widget of a dialog, else, the hint cannot be displayed.
- * For situations, where it is the only focusable control (widget box),
- * there is a special "refuseFocus()" mode, in which it clears the focus
- * policy and focusses explicitly on click (note that setting Qt::ClickFocus
- * is not sufficient for that as an ActivationFocus will occur). */
-
-#define ICONBUTTON_SIZE 16
-
-class QDESIGNER_SHARED_EXPORT HintLineEdit : public QLineEdit {
-    Q_OBJECT
-public:
-    explicit HintLineEdit(QWidget *parent = 0);
-
-    bool refuseFocus() const;
-    void setRefuseFocus(bool v);
-
-protected:
-    virtual void mousePressEvent(QMouseEvent *event);
-    virtual void focusInEvent(QFocusEvent *e);
-
-private:
-    const Qt::FocusPolicy m_defaultFocusPolicy;
-    bool m_refuseFocus;
-};
-
-// IconButton: This is a simple helper class that represents clickable icons
-
-class IconButton: public QToolButton
-{
-    Q_OBJECT
-    Q_PROPERTY(float fader READ fader WRITE setFader)
-public:
-    IconButton(QWidget *parent);
-    void paintEvent(QPaintEvent *event);
-    float fader() { return m_fader; }
-    void setFader(float value) { m_fader = value; update(); }
-    void animateShow(bool visible);
-
-private:
-    float m_fader;
-};
-
-// FilterWidget: For filtering item views, with reset button Uses HintLineEdit.
-
-class  QDESIGNER_SHARED_EXPORT FilterWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    enum LayoutMode {
-        // For use in toolbars: Expand to the right
-        LayoutAlignRight,
-        // No special alignment
-        LayoutAlignNone
-    };
-
-    explicit FilterWidget(QWidget *parent = 0, LayoutMode lm = LayoutAlignRight);
-
-    QString text() const;
-    void resizeEvent(QResizeEvent *);
-    bool refuseFocus() const; // see HintLineEdit
-    void setRefuseFocus(bool v);
-
-signals:
-    void filterChanged(const QString &);
-
-public slots:
-    void reset();
-
-private slots:
-    void checkButton(const QString &text);
-
-private:
-    HintLineEdit *m_editor;
-    IconButton *m_button;
-    int m_buttonwidth;
-    QString m_oldText;
-};
-} // namespace qdesigner_internal
-
-QT_END_NAMESPACE
-
-#endif

GUI/externals/qt-root-gui-factory/CMakeLists.txt

@@ -32,8 +32,7 @@ set(${library_name}_INCLUDE_DIRS ${include_dirs} PARENT_SCOPE)
 set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 
 # --- dependencies ---
-message("XXX ${GQt_LIBRARY}")
-message("XXX ${ROOT_LIBRARIES} ")
+
 include_directories(
     ${GQt_INCLUDE_DIRS}
     ${ROOT_INCLUDE_DIR}

GUI/externals/qtpropertybrowser/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8.9)
+
+set(library_name qtpropertybrowser)
+
+
+file(GLOB source_files "*.cpp")
+file(GLOB include_files "*.h")
+
+set(include_dirs
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR} # qtpropertybrowser needs some moc files
+)
+
+include_directories(${include_dirs})
+
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
+
+set(resource_files
+    "qtpropertybrowser.qrc"
+)
+
+set(CMAKE_AUTOMOC ON)
+qt5_add_resources(RC_SRCS ${resource_files})
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x040900)
+
+add_library(
+    ${library_name}
+    STATIC
+    ${source_files} ${include_files} ${RC_SRCS} ${mocfiles}
+)
+set(${library_name}_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
+
+target_link_libraries(${library_name} ${Qt5Widgets_LIBRARIES})
+
+qt5_use_modules(${library_name} Widgets)
+
+