From 86c3ef089c90b920d88cedf675c863080a71ece0 Mon Sep 17 00:00:00 2001 From: Atul R Date: Sat, 7 Mar 2020 10:28:30 +0100 Subject: [PATCH] Integration with Qode 2.0 (#400) * Moves qt integration solely to the nodegui core addon * Adds lint fixes * moved to integration core * cleans up export snippet * revert package.json * Add exit if app->exec finishes. * lint fix * Makes QApplication custom * adds qobject to wrap of qapp * Adds working qt run looper * Adds font default * Adds qt installer * Updates qode integration to v2.0.1 * fix cpp lints * Fixes lint and deps * Adds miniqt installation * adds setup mini qt script * skips tests due to issues with jest * fix config and download path for linux and windows * Adds multiple artifact downloader * fix qt config and compilation * Fixes qode path for windows (now it can load dll's easily) * Add compilation * fix windows path setup * use scripts directly * enabled tests back * fix ubuntu deps * update to alpha release * fix workflow * adds more artifacts and funding field * change to alpha v2 * update prebuild yml * revert build action * disabling prebuild for now * switch to stable release 5.14.1 * version bump --- .github/workflows/prebuild.yml | 43 +-- .github/workflows/test.yml | 3 + .gitignore | 3 +- .npmignore | 3 +- CMakeLists.txt | 19 +- config/common.cmake | 2 + config/qt.cmake | 90 +---- config/qtConfig.js | 72 ++++ jest.config.js | 4 +- package-lock.json | 329 +++++++----------- package.json | 28 +- scripts/qode.js | 33 ++ scripts/setupMiniQt.js | 28 ++ {config => scripts}/tests/setup.js | 0 {config => scripts}/tests/teardown.js | 0 .../include/nodegui/Extras/Export/export.h | 10 + src/cpp/include/nodegui/Extras/Utils/nutils.h | 12 +- .../include/nodegui/QtCore/QDate/qdate_wrap.h | 2 +- .../nodegui/QtCore/QDateTime/qdatetime_wrap.h | 2 +- .../QtCore/QModelIndex/qmodelindex_wrap.h | 2 +- .../nodegui/QtCore/QObject/nobject.hpp | 2 +- .../nodegui/QtCore/QObject/qobject_wrap.h | 2 +- .../nodegui/QtCore/QPoint/qpoint_wrap.h | 2 +- .../include/nodegui/QtCore/QRect/qrect_wrap.h | 2 +- .../include/nodegui/QtCore/QSize/qsize_wrap.h | 2 +- .../include/nodegui/QtCore/QTime/qtime_wrap.h | 2 +- .../include/nodegui/QtCore/QUrl/qurl_wrap.h | 2 +- .../nodegui/QtCore/QVariant/qvariant_wrap.h | 2 +- .../QtGui/QApplication/napplication.hpp | 17 + .../QtGui/QApplication/qapplication_wrap.h | 14 +- .../QtGui/QClipboard/qclipboard_wrap.h | 2 +- .../nodegui/QtGui/QColor/qcolor_wrap.h | 2 +- .../nodegui/QtGui/QCursor/qcursor_wrap.h | 2 +- .../QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h | 2 +- .../QEvent/QMouseEvent/qmouseevent_wrap.h | 2 +- .../include/nodegui/QtGui/QFont/qfont_wrap.h | 2 +- .../QtGui/QFontDatabase/qfontdatabase_wrap.h | 2 +- .../include/nodegui/QtGui/QIcon/qicon_wrap.h | 2 +- .../QtGui/QKeySequence/qkeysequence_wrap.h | 2 +- .../include/nodegui/QtGui/QMovie/nmovie.hpp | 2 +- .../nodegui/QtGui/QMovie/qmovie_wrap.h | 2 +- .../nodegui/QtGui/QPixmap/qpixmap_wrap.h | 2 +- .../nodegui/QtGui/QStyle/qstyle_wrap.h | 2 +- .../nodegui/QtWidgets/QAction/naction.hpp | 2 +- .../nodegui/QtWidgets/QAction/qaction_wrap.h | 2 +- .../QtWidgets/QBoxLayout/nboxlayout.hpp | 2 +- .../QtWidgets/QBoxLayout/qboxlayout_wrap.h | 2 +- .../QtWidgets/QButtonGroup/nbuttongroup.hpp | 2 +- .../QButtonGroup/qbuttongroup_wrap.h | 2 +- .../QCalendarWidget/ncalendarwidget.hpp | 2 +- .../QCalendarWidget/qcalendarwidget_wrap.h | 2 +- .../nodegui/QtWidgets/QCheckBox/ncheckbox.hpp | 2 +- .../QtWidgets/QCheckBox/qcheckbox_wrap.h | 2 +- .../nodegui/QtWidgets/QComboBox/ncombobox.hpp | 2 +- .../QtWidgets/QComboBox/qcombobox_wrap.h | 2 +- .../nodegui/QtWidgets/QDateEdit/ndateedit.hpp | 2 +- .../QtWidgets/QDateEdit/qdateedit_wrap.h | 2 +- .../QtWidgets/QDateTimeEdit/ndatetimeedit.hpp | 2 +- .../QDateTimeEdit/qdatetimeedit_wrap.h | 2 +- .../include/nodegui/QtWidgets/QDial/ndial.hpp | 2 +- .../nodegui/QtWidgets/QDial/qdial_wrap.h | 2 +- .../nodegui/QtWidgets/QDialog/ndialog.hpp | 2 +- .../nodegui/QtWidgets/QDialog/qdialog_wrap.h | 2 +- .../QtWidgets/QFileDialog/nfiledialog.hpp | 2 +- .../QtWidgets/QFileDialog/qfiledialog_wrap.h | 2 +- .../QtWidgets/QGridLayout/ngridlayout.hpp | 2 +- .../QtWidgets/QGridLayout/qgridlayout_wrap.h | 2 +- .../nodegui/QtWidgets/QGroupBox/ngroupbox.hpp | 2 +- .../QtWidgets/QGroupBox/qgroupbox_wrap.h | 2 +- .../QtWidgets/QInputDialog/ninputdialog.hpp | 2 +- .../QInputDialog/qinputdialog_wrap.h | 2 +- .../nodegui/QtWidgets/QLabel/nlabel.hpp | 3 +- .../nodegui/QtWidgets/QLabel/qlabel_wrap.h | 3 +- .../nodegui/QtWidgets/QLayout/nlayout.hpp | 2 +- .../nodegui/QtWidgets/QLayout/qlayout_wrap.h | 2 +- .../nodegui/QtWidgets/QLineEdit/nlineedit.hpp | 2 +- .../QtWidgets/QLineEdit/qlineedit_wrap.h | 2 +- .../QtWidgets/QListWidget/nlistwidget.hpp | 2 +- .../QtWidgets/QListWidget/qlistwidget_wrap.h | 2 +- .../QtWidgets/QMainWindow/nmainwindow.hpp | 2 +- .../QtWidgets/QMainWindow/qmainwindow_wrap.h | 2 +- .../include/nodegui/QtWidgets/QMenu/nmenu.hpp | 2 +- .../nodegui/QtWidgets/QMenu/qmenu_wrap.h | 2 +- .../nodegui/QtWidgets/QMenuBar/nmenubar.hpp | 2 +- .../QtWidgets/QMenuBar/qmenubar_wrap.h | 2 +- .../QtWidgets/QMessageBox/nmessagebox.hpp | 2 +- .../QtWidgets/QMessageBox/qmessagebox_wrap.h | 2 +- .../QtWidgets/QPainter/qpainter_wrap.h | 2 +- .../QPlainTextEdit/nplaintextedit.hpp | 2 +- .../QPlainTextEdit/qplaintextedit_wrap.h | 2 +- .../QtWidgets/QProgressBar/nprogressbar.hpp | 2 +- .../QProgressBar/qprogressbar_wrap.h | 2 +- .../QtWidgets/QPushButton/npushbutton.hpp | 2 +- .../QtWidgets/QPushButton/qpushbutton_wrap.h | 2 +- .../QtWidgets/QRadioButton/nradiobutton.hpp | 2 +- .../QRadioButton/qradiobutton_wrap.h | 2 +- .../QtWidgets/QScrollArea/nscrollarea.hpp | 2 +- .../QtWidgets/QScrollArea/qscrollarea_wrap.h | 2 +- .../QtWidgets/QScrollBar/nscrollbar.hpp | 2 +- .../QtWidgets/QScrollBar/qscrollbar_wrap.h | 2 +- .../nodegui/QtWidgets/QShortcut/nshortcut.hpp | 2 +- .../QtWidgets/QShortcut/qshortcut_wrap.h | 2 +- .../nodegui/QtWidgets/QSlider/nslider.hpp | 2 +- .../nodegui/QtWidgets/QSlider/qslider_wrap.h | 2 +- .../nodegui/QtWidgets/QSpinBox/nspinbox.hpp | 2 +- .../QtWidgets/QSpinBox/qspinbox_wrap.h | 2 +- .../QStackedWidget/nstackedwidget.hpp | 3 +- .../QStackedWidget/qstackedwidget_wrap.h | 2 +- .../QtWidgets/QStatusBar/nstatusbar.hpp | 2 +- .../QtWidgets/QStatusBar/qstatusbar_wrap.h | 2 +- .../QSystemTrayIcon/nsystemtrayicon.hpp | 2 +- .../QSystemTrayIcon/qsystemtrayicon_wrap.h | 2 +- .../QtWidgets/QTabWidget/ntabwidget.hpp | 2 +- .../QtWidgets/QTabWidget/qtabwidget_wrap.h | 2 +- .../QtWidgets/QTableWidget/ntablewidget.hpp | 2 +- .../QTableWidget/qtablewidget_wrap.h | 2 +- .../QTableWidgetItem/qtablewidgetitem_wrap.h | 2 +- .../nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp | 2 +- .../QtWidgets/QTimeEdit/qtimeedit_wrap.h | 2 +- .../QtWidgets/QToolButton/ntoolbutton.hpp | 2 +- .../QtWidgets/QToolButton/qtoolbutton_wrap.h | 2 +- .../QtWidgets/QTreeWidget/ntreewidget.hpp | 2 +- .../QtWidgets/QTreeWidget/qtreewidget_wrap.h | 2 +- .../QTreeWidgetItem/qtreewidgetitem_wrap.h | 2 +- .../nodegui/QtWidgets/QWidget/nwidget.hpp | 2 +- .../nodegui/QtWidgets/QWidget/qwidget_wrap.h | 2 +- .../nodegui/core/Component/component_wrap.h | 2 +- .../include/nodegui/core/Events/eventsmap.h | 2 +- .../include/nodegui/core/Events/eventwidget.h | 2 +- .../nodegui/core/FlexLayout/flexitem.h | 2 +- .../nodegui/core/FlexLayout/flexlayout.hpp | 2 +- .../nodegui/core/FlexLayout/flexlayout_wrap.h | 2 +- .../nodegui/core/FlexLayout/flexutils.h | 2 +- .../nodegui/core/Integration/integration.h | 4 + .../nodegui/core/Integration/qode-api.h | 15 + .../nodegui/core/NodeWidget/nodewidget.h | 2 +- .../nodegui/core/YogaWidget/nodestyle.h | 2 +- .../nodegui/core/YogaWidget/yogawidget.h | 2 +- src/cpp/lib/Extras/Utils/nutils.cpp | 10 - .../QtGui/QApplication/qapplication_wrap.cpp | 15 +- .../QtGui/QKeySequence/qkeysequence_wrap.cpp | 1 + src/cpp/lib/core/FlexLayout/flexlayout.cpp | 1 - src/cpp/lib/core/Integration/integration.cpp | 30 ++ src/cpp/main.cpp | 3 +- src/index.ts | 2 +- src/lib/QtCore/QSettings.ts | 4 +- src/lib/QtGui/QApplication.ts | 15 +- 147 files changed, 563 insertions(+), 484 deletions(-) create mode 100644 config/qtConfig.js create mode 100644 scripts/qode.js create mode 100644 scripts/setupMiniQt.js rename {config => scripts}/tests/setup.js (100%) rename {config => scripts}/tests/teardown.js (100%) create mode 100644 src/cpp/include/nodegui/Extras/Export/export.h create mode 100644 src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp create mode 100644 src/cpp/include/nodegui/core/Integration/integration.h create mode 100644 src/cpp/include/nodegui/core/Integration/qode-api.h create mode 100644 src/cpp/lib/core/Integration/integration.cpp diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml index 693346f26..a72f190f3 100644 --- a/.github/workflows/prebuild.yml +++ b/.github/workflows/prebuild.yml @@ -2,7 +2,7 @@ on: repository_dispatch: types: [on-demand-build] release: - types: [published, created, prereleased] + types: [created] jobs: build: strategy: @@ -14,22 +14,25 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.ref }} - - uses: actions/setup-node@master - with: - node-version: '13.x' - - name: Install deps - run: npm install - env: - SKIP_BUILD: 1 - - name: Change version if master - if: contains(github.event.client_payload.tag, '0.0.0-latest-master') - run: npm --no-git-tag-version version 0.0.0-latest-master - - name: Prebuild binary - run: npx prebuild --all --backend=cmake-js --strip --runtime=napi --include-regex="\.[n,e,l][a-z]*$" - - name: Release - uses: softprops/action-gh-release@master - with: - files: prebuilds/@nodegui/*.tar.gz - tag_name: ${{ github.event.release.tag_name || github.event.client_payload.tag }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - uses: actions/setup-node@master + # with: + # node-version: '13.x' + # - name: Install ubuntu deps + # if: contains(matrix.os, 'ubuntu') + # run: sudo apt install mesa-common-dev libglu1-mesa-dev + # - name: Install deps + # run: npm install + # env: + # SKIP_BUILD: 1 + # - name: Change version if master + # if: contains(github.event.client_payload.tag, '0.0.0-latest-master') + # run: npm --no-git-tag-version version 0.0.0-latest-master + # - name: Prebuild binary + # run: npx prebuild --all --backend=cmake-js --strip --runtime=napi --include-regex="\.[n,e,l][a-z]*$" + # - name: Release + # uses: softprops/action-gh-release@master + # with: + # files: prebuilds/@nodegui/*.tar.gz + # tag_name: ${{ github.event.release.tag_name || github.event.client_payload.tag }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84bed28c1..42fe981b2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,9 @@ jobs: - uses: actions/setup-node@master with: node-version: '13.x' + - name: Install ubuntu deps + if: contains(matrix.os, 'ubuntu') + run: sudo apt install mesa-common-dev libglu1-mesa-dev - name: Install deps run: npm install - name: Build nodegui diff --git a/.gitignore b/.gitignore index 38e6b32d5..79df30ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ dist coverage .DS_Store /.idea/ -/prebuilds \ No newline at end of file +/prebuilds +miniqt \ No newline at end of file diff --git a/.npmignore b/.npmignore index 7721cc522..ffcb68596 100644 --- a/.npmignore +++ b/.npmignore @@ -7,4 +7,5 @@ extras/* !extras/legal src/* !src/cpp -prebuilds/* \ No newline at end of file +prebuilds/* +miniqt/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index a3cfb3b8a..a6fd545bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ add_library(${CORE_WIDGETS_ADDON} SHARED "${PROJECT_SOURCE_DIR}/src/cpp/main.cpp" # core internals "${PROJECT_SOURCE_DIR}/src/cpp/lib/Extras/Utils/nutils.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/Integration/integration.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/FlexLayout/flexutils.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/FlexLayout/flexlayout.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/FlexLayout/flexitem.cpp" @@ -112,6 +113,7 @@ add_library(${CORE_WIDGETS_ADDON} SHARED "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp" @@ -170,15 +172,22 @@ target_include_directories(${CORE_WIDGETS_ADDON} PRIVATE "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui" ) -target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE - "${CMAKE_JS_LIB}" -) - if (WIN32) target_compile_definitions(${CORE_WIDGETS_ADDON} PRIVATE ENABLE_DLL_EXPORT=1 ) + target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE + "${PROJECT_SOURCE_DIR}/node_modules/@nodegui/qode/binaries/qode.lib" + ) target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP4") -endif() \ No newline at end of file +endif() + +target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE + "${CMAKE_JS_LIB}" + Qt5::Widgets + Qt5::Core + Qt5::Gui +) + diff --git a/config/common.cmake b/config/common.cmake index f362225cd..5d68d9155 100644 --- a/config/common.cmake +++ b/config/common.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INCLUDE_CURRENT_DIR ON) + find_program(CCACHE_PROGRAM ccache) if(CCACHE_PROGRAM) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") diff --git a/config/qt.cmake b/config/qt.cmake index 83ecf92b9..ad9487e93 100644 --- a/config/qt.cmake +++ b/config/qt.cmake @@ -1,79 +1,25 @@ # Adds Qt support # make sure you include this at the top of whichever Cmakelist file you are going to use. -# Need for automatic moc. Moc executable path is set in qt.cmake -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(QT_VERSION_MAJOR 5) -set(QT_VERSION_MINOR 13) -add_executable(Qt5::moc IMPORTED) +# Need for automatic moc. -function(AddQtSupport addonName) - execute_process(COMMAND node -p "require('@nodegui/qode').qtHome" +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(QTCONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/qtConfig.js) + +macro(AddQtSupport addonName) + execute_process(COMMAND node -p "require('${QTCONFIG_FILE}').qtCmakeDir" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE QT_HOME_DIR + OUTPUT_VARIABLE QT_CMAKE_HOME_DIR ) - if(DEFINED ENV{QT_INSTALL_DIR}) - # Allows to use custom Qt installation via QT_INSTALL_DIR env variable - message(STATUS "Using Custom QT installation for ${addonName} QT_INSTALL_DIR:$ENV{QT_INSTALL_DIR}") - set(QT_HOME_DIR "$ENV{QT_INSTALL_DIR}") - endif() - - string(REPLACE "\n" "" QT_HOME_DIR "${QT_HOME_DIR}") - string(REPLACE "\"" "" QT_HOME_DIR "${QT_HOME_DIR}") - - if(APPLE) - set(CUSTOM_QT_MOC_PATH "${QT_HOME_DIR}/bin/moc") - - target_include_directories(${addonName} PRIVATE - "${QT_HOME_DIR}/include" - "${QT_HOME_DIR}/lib/QtCore.framework/Versions/5/Headers" - "${QT_HOME_DIR}/lib/QtGui.framework/Versions/5/Headers" - "${QT_HOME_DIR}/lib/QtWidgets.framework/Versions/5/Headers" - ) - target_link_libraries(${addonName} PRIVATE - "${QT_HOME_DIR}/lib/QtCore.framework/Versions/5/QtCore" - "${QT_HOME_DIR}/lib/QtGui.framework/Versions/5/QtGui" - "${QT_HOME_DIR}/lib/QtWidgets.framework/Versions/5/QtWidgets" - ) - endif() - - if (WIN32) - set(CUSTOM_QT_MOC_PATH "${QT_HOME_DIR}\\bin\\moc.exe") - - target_include_directories(${addonName} PRIVATE - "${QT_HOME_DIR}\\include" - "${QT_HOME_DIR}\\include\\QtCore" - "${QT_HOME_DIR}\\include\\QtGui" - "${QT_HOME_DIR}\\include\\QtWidgets" - ) - target_link_libraries(${addonName} PRIVATE - "${QT_HOME_DIR}\\lib\\Qt5Core.lib" - "${QT_HOME_DIR}\\lib\\Qt5Gui.lib" - "${QT_HOME_DIR}\\lib\\Qt5Widgets.lib" - ) - endif() - - if(UNIX AND NOT APPLE) - set(LINUX TRUE) - endif() - - if(LINUX) - set(CUSTOM_QT_MOC_PATH "${QT_HOME_DIR}/bin/moc") - target_include_directories(${addonName} PRIVATE - "${QT_HOME_DIR}/include" - "${QT_HOME_DIR}/include/QtCore" - "${QT_HOME_DIR}/include/QtGui" - "${QT_HOME_DIR}/include/QtWidgets" - ) - target_link_libraries(${addonName} PRIVATE - "${QT_HOME_DIR}/lib/libQt5Core.so" - "${QT_HOME_DIR}/lib/libQt5Gui.so" - "${QT_HOME_DIR}/lib/libQt5Widgets.so" - ) - endif() + string(REPLACE "\n" "" QT_CMAKE_HOME_DIR "${QT_CMAKE_HOME_DIR}") + string(REPLACE "\"" "" QT_CMAKE_HOME_DIR "${QT_CMAKE_HOME_DIR}") - # set custom moc executable location - set_target_properties(Qt5::moc PROPERTIES IMPORTED_LOCATION "${CUSTOM_QT_MOC_PATH}") - -endfunction(AddQtSupport addonName) + message(STATUS "Using QT installation for ${addonName} QT_CMAKE_HOME_DIR:${QT_CMAKE_HOME_DIR}") + + set(Qt5_DIR ${QT_CMAKE_HOME_DIR}) + find_package(Qt5 COMPONENTS Widgets Gui Core REQUIRED) + +endmacro(AddQtSupport addonName) diff --git a/config/qtConfig.js b/config/qtConfig.js new file mode 100644 index 000000000..3226fc1a4 --- /dev/null +++ b/config/qtConfig.js @@ -0,0 +1,72 @@ +const os = require('os'); +const path = require('path'); + +const SETUP_DIR = path.resolve(__dirname, '..', 'miniqt'); +const QT_VERSION = '5.14.1'; + +function getMiniQtConfig() { + switch (os.platform()) { + case 'darwin': { + return { + qtHome: path.resolve(SETUP_DIR, QT_VERSION, 'clang_64'), + artifacts: [ + { + name: 'Qt Base', + link: `https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt5_5141/qt.qt5.5141.clang_64/5.14.1-0-202001241000qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`, + }, + { + name: 'Qt Tools', + link: `https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt5_5141/qt.qt5.5141.clang_64/5.14.1-0-202001241000qttools-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`, + }, + ], + }; + } + case 'win32': { + return { + qtHome: path.resolve(SETUP_DIR, QT_VERSION, 'msvc2017_64'), + artifacts: [ + { + name: 'Qt Base', + link: `https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5141/qt.qt5.5141.win64_msvc2017_64/5.14.1-0-202001240957qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z`, + }, + { + name: 'Qt Tools', + link: `https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5141/qt.qt5.5141.win64_msvc2017_64/5.14.1-0-202001240957qttools-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z`, + }, + ], + }; + } + case 'linux': { + return { + qtHome: path.resolve(SETUP_DIR, QT_VERSION, 'gcc_64'), + artifacts: [ + { + name: 'Qt Base', + link: `https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5141/qt.qt5.5141.gcc_64/5.14.1-0-202001240953qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z`, + }, + { + name: 'Qt ICU', + link: `https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5141/qt.qt5.5141.gcc_64/5.14.1-0-202001240953icu-linux-Rhel7.2-x64.7z`, + }, + ], + }; + } + } +} + +const miniQt = { + ...getMiniQtConfig(), + version: QT_VERSION, + setupDir: SETUP_DIR, +}; + +const useCustomQt = Boolean(process.env.QT_INSTALL_DIR); +const qtHome = useCustomQt ? process.env.QT_INSTALL_DIR : miniQt.qtHome; +const qtCmakeDir = path.resolve(qtHome, 'lib', 'cmake', 'Qt5'); + +module.exports = { + qtHome, + miniQt, + qtCmakeDir, + useCustomQt, +}; diff --git a/jest.config.js b/jest.config.js index f3d447550..cb84b9348 100644 --- a/jest.config.js +++ b/jest.config.js @@ -11,6 +11,6 @@ module.exports = { transform: { '^.+\\.tsx?$': 'ts-jest', }, - globalSetup: './config/tests/setup.js', - globalTeardown: './config/tests/teardown.js', + globalSetup: './scripts/tests/setup.js', + globalTeardown: './scripts/tests/teardown.js', }; diff --git a/package-lock.json b/package-lock.json index d569ed631..b0b33d8c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9 +1,22 @@ { "name": "@nodegui/nodegui", - "version": "0.13.4", + "version": "0.15.0-alpha-4", "lockfileVersion": 1, "requires": true, "dependencies": { + "7zip-bin": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.0.3.tgz", + "integrity": "sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==" + }, + "7zip-min": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/7zip-min/-/7zip-min-1.1.1.tgz", + "integrity": "sha512-GPTk3xycxB0NjRM1SKAUL7TWXjgFAyzwXkamkk5YgSLd6OneeWBw+fxULctrVr4XqPBBh+LyqpHlyj9ryfpqoQ==", + "requires": { + "7zip-bin": "^5.0.3" + } + }, "@babel/code-frame": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", @@ -1107,22 +1120,93 @@ } } }, - "@nodegui/qode": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@nodegui/qode/-/qode-1.0.6.tgz", - "integrity": "sha512-Np6r91wDCzV4+PCepr83t+BjWBtZMh5WT9/68mXXSMJi+ueZbYXL0d5VAIJ84C87NMwnA/7hdoqppp8lgzymvg==", + "@nodegui/artifact-installer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@nodegui/artifact-installer/-/artifact-installer-1.0.0.tgz", + "integrity": "sha512-qKtlsXgO/fNppgVfkuTkHmgALZQgppjvJ5XJg3+J90SeIQBri1KRk8H/3CgKL/MmXsDJkvWftQrX9BmZ9uKv+Q==", "requires": { + "7zip-min": "^1.1.1", + "empty-dir": "^2.0.0", "env-paths": "^2.2.0", - "extract-zip": "^1.6.7", - "fs-extra": "^8.1.0", - "got": "^9.6.0", + "make-dir": "^3.0.0", + "node-fetch": "^2.6.0", "progress": "^2.0.3" } }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + "@nodegui/qode": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@nodegui/qode/-/qode-2.0.4.tgz", + "integrity": "sha512-fnyPXoAHm2k+EUUV8ACRhjl2rNDQKRpyAQzYbsWNM4x1ExhrHy/U6KwQam82FaUVVCLaCNLTAiNaWyRR/XP83A==", + "requires": { + "env-paths": "^2.2.0", + "make-dir": "^3.0.2", + "node-fetch": "^2.6.0", + "progress": "^2.0.3", + "tar": "^6.0.1" + }, + "dependencies": { + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "requires": { + "semver": "^6.0.0" + } + }, + "minipass": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", + "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", + "requires": { + "yallist": "^4.0.0" + } + }, + "minizlib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", + "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz", + "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==" + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "tar": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz", + "integrity": "sha512-bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==", + "requires": { + "chownr": "^1.1.3", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.0", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } }, "@sinonjs/commons": { "version": "1.7.0", @@ -1133,14 +1217,6 @@ "type-detect": "4.0.8" } }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "requires": { - "defer-to-connect": "^1.0.1" - } - }, "@types/babel__core": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz", @@ -1970,7 +2046,8 @@ "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true }, "buffer-indexof-polyfill": { "version": "1.0.1", @@ -2004,35 +2081,6 @@ "unset-value": "^1.0.0" } }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" - } - } - }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -2163,14 +2211,6 @@ "wrap-ansi": "^2.0.0" } }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "requires": { - "mimic-response": "^1.0.0" - } - }, "cmake-js": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cmake-js/-/cmake-js-6.1.0.tgz", @@ -2289,17 +2329,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -2466,6 +2495,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { "ms": "2.0.0" } @@ -2481,14 +2511,6 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "requires": { - "mimic-response": "^1.0.0" - } - }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -2500,11 +2522,6 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, - "defer-to-connect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.0.tgz", - "integrity": "sha512-WE2sZoctWm/v4smfCAdjYbrfS55JiMRdlY9ZubFhsYbteCK9+BvAx4YV7nPjYM6ZnX5BcoVKwfmyx9sIFTgQMQ==" - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -2608,11 +2625,6 @@ "readable-stream": "^2.0.2" } }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" - }, "each-series-async": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/each-series-async/-/each-series-async-1.0.1.tgz", @@ -2634,6 +2646,11 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "empty-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/empty-dir/-/empty-dir-2.0.0.tgz", + "integrity": "sha512-XAedXlNAQZxMmbllXY9cxuESlNVjZ8xd67bSIUZwbS7VoLyhlNehVN3Iy35yDTGFHKR1opBRgORkp3am0so+WQ==" + }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -3212,17 +3229,6 @@ } } }, - "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", - "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" - } - }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -3259,14 +3265,6 @@ "bser": "2.1.1" } }, - "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", - "requires": { - "pend": "~1.2.0" - } - }, "figures": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", @@ -3380,6 +3378,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -3463,6 +3462,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, "requires": { "pump": "^3.0.0" } @@ -3547,24 +3547,6 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - } - }, "graceful-fs": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", @@ -3707,11 +3689,6 @@ "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==", "dev": true }, - "http-cache-semantics": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", - "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==" - }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", @@ -6831,11 +6808,6 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" - }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -6911,14 +6883,6 @@ "verror": "1.10.0" } }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "requires": { - "json-buffer": "3.0.0" - } - }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -7022,11 +6986,6 @@ "@sinonjs/commons": "^1.7.0" } }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" - }, "lunr": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz", @@ -7037,7 +6996,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", - "dev": true, "requires": { "semver": "^6.0.0" }, @@ -7045,8 +7003,7 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, @@ -7065,6 +7022,11 @@ "tmpl": "1.0.x" } }, + "manage-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/manage-path/-/manage-path-2.0.0.tgz", + "integrity": "sha1-9M+EV7km7u4qg7FzUBQUvHbrlZc=" + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -7152,11 +7114,6 @@ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" - }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -7219,7 +7176,8 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true }, "mute-stream": { "version": "0.0.8", @@ -7295,6 +7253,11 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "node-gyp": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz", @@ -7460,11 +7423,6 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" - }, "npm-path": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", @@ -7728,11 +7686,6 @@ "os-tmpdir": "^1.0.0" } }, - "p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" - }, "p-each-series": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", @@ -7840,11 +7793,6 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" - }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -8122,11 +8070,6 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - }, "prettier": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", @@ -8424,14 +8367,6 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "requires": { - "lowercase-keys": "^1.0.0" - } - }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -9386,11 +9321,6 @@ } } }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -9590,11 +9520,6 @@ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -9806,14 +9731,6 @@ "resolved": "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz", "integrity": "sha1-HbSK1CLTQCRpqH99l73r/k+x48g=" }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - } - }, "url-template": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz", @@ -10102,14 +10019,6 @@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } - }, - "yauzl": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", - "requires": { - "fd-slicer": "~1.0.1" - } } } } diff --git a/package.json b/package.json index 6da9fe6e5..0779ec2c3 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,38 @@ { "name": "@nodegui/nodegui", - "version": "0.13.4", + "version": "0.15.0-alpha-4", "description": "A cross platform library to build native desktop apps.", "main": "dist/index.js", "typings": "dist/index.d.ts", "author": "Atul R ", "license": "MIT", "private": false, + "bin": { + "qode": "./scripts/qode.js" + }, + "funding": { + "url": "https://github.com/sponsors/master-atul" + }, "scripts": { - "dev": "npm run build && qode dist/demo.js", - "build": "tsc && npm run build:addon", - "postinstall": "cross-env node ./scripts/skip.js || npm run prebuild:install || npm run build:addon", + "dev": "cross-env npm run build && node ./scripts/qode.js dist/demo.js", + "build": "cross-env tsc && npm run build:addon", + "postinstall": "cross-env npm run setupqt && (node ./scripts/skip.js || npm run prebuild:install || npm run build:addon)", + "setupqt": "cross-env node ./scripts/setupMiniQt.js", "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js compile", "prebuild:install": "prebuild-install --backend=cmake-js --runtime=napi --verbose", - "test": "qode ./node_modules/jest/bin/jest -i", - "lint:cpp": "clang-format -i --glob=src/cpp/**/*.[h,c]*", - "lint:ts": "tsc --noEmit && cross-env eslint './src/**/*.{ts,tsx,js,jsx}' --fix", - "docs": "typedoc && node ./website/docs/scripts/fixdocs.js" + "test": "node ./scripts/qode.js ./node_modules/jest/bin/jest -i", + "lint:cpp": "cross-env clang-format -i --glob=src/cpp/**/*.[h,c]*", + "lint:ts": "cross-env tsc --noEmit && cross-env eslint './src/**/*.{ts,tsx,js,jsx}' --fix", + "docs": "cross-env typedoc && node ./website/docs/scripts/fixdocs.js", + "qode": "cross-env node ./scripts/qode.js" }, "dependencies": { - "@nodegui/qode": "^1.0.6", + "@nodegui/artifact-installer": "^1.0.0", + "@nodegui/qode": "^2.0.4", "cmake-js": "^6.0.0", "cross-env": "^7.0.0", "cuid": "^2.1.6", + "manage-path": "^2.0.0", "node-addon-api": "^2.0.0", "postcss-nodegui-autoprefixer": "0.0.7", "prebuild-install": "^5.3.3" diff --git a/scripts/qode.js b/scripts/qode.js new file mode 100644 index 000000000..689190696 --- /dev/null +++ b/scripts/qode.js @@ -0,0 +1,33 @@ +#!/usr/bin/env node + +var path = require('path'); +var qodeConfig = require('@nodegui/qode'); +var managePath = require('manage-path'); +var qtConfig = require('../config/qtConfig'); + +var proc = require('child_process'); + +// Add Qt's bin to the path of Qode so that it can find the dll's +var alterPath = managePath(process.env); +alterPath.unshift(path.join(qtConfig.qtHome, 'bin')); + +var child = proc.spawn(qodeConfig.qodePath, process.argv.slice(2), { + stdio: 'inherit', + windowsHide: false, + env: process.env, +}); + +child.on('close', function(code) { + process.exit(code); +}); + +const handleTerminationSignal = function(signal) { + process.on(signal, function signalHandler() { + if (!child.killed) { + child.kill(signal); + } + }); +}; + +handleTerminationSignal('SIGINT'); +handleTerminationSignal('SIGTERM'); diff --git a/scripts/setupMiniQt.js b/scripts/setupMiniQt.js new file mode 100644 index 000000000..1175548d3 --- /dev/null +++ b/scripts/setupMiniQt.js @@ -0,0 +1,28 @@ +#!/usr/bin/env node + +const { setupArtifact } = require('@nodegui/artifact-installer'); +const { miniQt, useCustomQt, qtHome } = require('../config/qtConfig'); + +if (!useCustomQt) { + console.log(`Minimal Qt ${miniQt.version} setup:`); +} else { + console.log(`CustomQt detected at ${qtHome} . Hence, skipping Mini Qt installation...`); +} + +async function setupQt() { + return Promise.all( + miniQt.artifacts.map(async artifact => + setupArtifact({ + outDir: miniQt.setupDir, + id: 'nodegui-mini-qt', + displayName: `${artifact.name} for Minimal Qt: ${miniQt.version} installation`, + downloadLink: artifact.link, + }), + ), + ); +} + +setupQt().catch(err => { + console.error(err); + process.exit(1); +}); diff --git a/config/tests/setup.js b/scripts/tests/setup.js similarity index 100% rename from config/tests/setup.js rename to scripts/tests/setup.js diff --git a/config/tests/teardown.js b/scripts/tests/teardown.js similarity index 100% rename from config/tests/teardown.js rename to scripts/tests/teardown.js diff --git a/src/cpp/include/nodegui/Extras/Export/export.h b/src/cpp/include/nodegui/Extras/Export/export.h new file mode 100644 index 000000000..86e5b498b --- /dev/null +++ b/src/cpp/include/nodegui/Extras/Export/export.h @@ -0,0 +1,10 @@ + +#ifdef _WINDLL +#ifdef ENABLE_DLL_EXPORT +#define DLL_EXPORT __declspec(dllexport) +#else +#define DLL_EXPORT __declspec(dllimport) +#endif +#else +#define DLL_EXPORT +#endif \ No newline at end of file diff --git a/src/cpp/include/nodegui/Extras/Utils/nutils.h b/src/cpp/include/nodegui/Extras/Utils/nutils.h index 4c1e03fdb..993ccee46 100644 --- a/src/cpp/include/nodegui/Extras/Utils/nutils.h +++ b/src/cpp/include/nodegui/Extras/Utils/nutils.h @@ -1,20 +1,11 @@ #pragma once -#ifdef _WINDLL -#ifdef ENABLE_DLL_EXPORT -#define DLL_EXPORT __declspec(dllexport) -#else -#define DLL_EXPORT __declspec(dllimport) -#endif -#else -#define DLL_EXPORT -#endif - #include #include #include +#include "Extras/Export/export.h" #include "core/FlexLayout/flexutils.h" #include "deps/yoga/YGNode.h" @@ -33,7 +24,6 @@ void safeDelete(QPointer& component) { delete component; } } -void initAppSettings(); } // namespace extrautils class DLL_EXPORT NUtilsWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h b/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h index 677c6921f..4bb91bf25 100644 --- a/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QDateWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h b/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h index 06372afa7..8dfdd7f8b 100644 --- a/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QDateTimeWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h b/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h index 98a8f7924..32ca3e95d 100644 --- a/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QModelIndexWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp b/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp index d10340d4d..8ae9c46f7 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp +++ b/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/Events/eventwidget.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h index 8f44486e3..a0129e050 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/nobject.hpp" #include "QtCore/QObject/qobject_macro.h" diff --git a/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h b/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h index d6c3b0c0e..ae560c4f5 100644 --- a/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QPointWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h b/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h index 2ba304e4f..5e98fed50 100644 --- a/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QRectWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h index f76546618..5e263d8cd 100644 --- a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QSizeWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h b/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h index b27135db1..71b3e5000 100644 --- a/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QTimeWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h b/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h index c89c12705..405e43b32 100644 --- a/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QUrlWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h b/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h index 0cd57774b..e6423469d 100644 --- a/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QVariantWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp b/src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp new file mode 100644 index 000000000..3feb29a43 --- /dev/null +++ b/src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp @@ -0,0 +1,17 @@ +#pragma once +#include + +#include "Extras/Export/export.h" +#include "QtCore/QObject/qobject_macro.h" +#include "napi.h" + +class DLL_EXPORT NApplication : public QApplication, public EventWidget { + Q_OBJECT + EVENTWIDGET_IMPLEMENTATIONS(QApplication) + public: + using QApplication::QApplication; // inherit all constructors of QApplication + void connectSignalsToEventEmitter() { + // Qt Connects: Implement all signal connects here + QOBJECT_SIGNALS + } +}; diff --git a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h index 75357a270..def3e87ef 100644 --- a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h @@ -2,19 +2,17 @@ #include -#include #include -#include "Extras/Utils/nutils.h" -#include "core/Component/component_macro.h" +#include "Extras/Export/export.h" +#include "QtCore/QObject/qobject_macro.h" +#include "napplication.hpp" class DLL_EXPORT QApplicationWrap : public Napi::ObjectWrap { - COMPONENT_WRAPPED_METHODS_DECLARATION + QOBJECT_WRAPPED_METHODS_DECLARATION private: - QPointer instance; - static int argc; - static char** argv; + QPointer instance; bool _wasManuallyCreated = false; public: @@ -22,7 +20,7 @@ class DLL_EXPORT QApplicationWrap : public Napi::ObjectWrap { static Napi::Object init(Napi::Env env, Napi::Object exports); QApplicationWrap(const Napi::CallbackInfo& info); ~QApplicationWrap(); - QApplication* getInternalInstance(); + NApplication* getInternalInstance(); // Wrapped methods Napi::Value processEvents(const Napi::CallbackInfo& info); Napi::Value exec(const Napi::CallbackInfo& info); diff --git a/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h b/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h index 3d37e63a4..51b1b003e 100644 --- a/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QClipboardWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h index d28fbc1dd..d6593a3a4 100644 --- a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QColorWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h b/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h index e698448ad..5708d2150 100644 --- a/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QCursorWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h b/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h index 596f56cf9..09f68975a 100644 --- a/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QKeyEventWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h b/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h index e9cac08ce..e59701f99 100644 --- a/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QMouseEventWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h b/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h index 349267b39..f258ceaf4 100644 --- a/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QFontWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h b/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h index e296eb903..81e4e6d1b 100644 --- a/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QFontDatabaseWrap diff --git a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h index 0ec94d651..839a970d6 100644 --- a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QIconWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h b/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h index e2195a23b..4fdf4f525 100644 --- a/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QKeySequenceWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp b/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp index 26a213ca0..b9159dbc6 100644 --- a/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp +++ b/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "QtCore/QRect/qrect_wrap.h" #include "QtCore/QSize/qsize_wrap.h" diff --git a/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h b/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h index 9a8f5558d..d287937ef 100644 --- a/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h @@ -6,7 +6,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nmovie.hpp" diff --git a/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h b/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h index 9d3e77ad2..446fc771a 100644 --- a/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QPixmapWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h b/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h index 07d65c774..c1f5d9948 100644 --- a/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QStyleWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp b/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp index 39feea1aa..f28b0a80e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h index 070fc2362..a8bb475e7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "naction.hpp" class DLL_EXPORT QActionWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp index 80a06a501..0f5fb9eb1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h index 8e5657e6e..b84a85bde 100644 --- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QBoxLayout/nboxlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp index 1d8c7b653..2ec5d5d20 100644 --- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h index ed58872a4..1f79b7722 100644 --- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nbuttongroup.hpp" class DLL_EXPORT QButtonGroupWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp index d1dfa60b3..cc803e2c2 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QDate/qdate_wrap.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h index ff82ef26e..30cdd66cd 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QCalendarWidget/ncalendarwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp b/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp index f745c2ddf..9a3684b19 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h index 5e4a474df..67809fe2d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ncheckbox.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp b/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp index 5debbf809..7147c4cb9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h index 3bf3e658c..291fe7e62 100644 --- a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QComboBox/ncombobox.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp b/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp index aade7255c..16a7e0639 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h index 9b0f9c196..37d09271e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ndateedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp index 27cd7728a..2557b11d9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h index 5430bc454..7f6ffcc83 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ndatetimeedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp b/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp index b747c0173..117136f22 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h index 1e00f8ada..f6fa9c4e6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ndial.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp b/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp index 7b824905a..ffc115103 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h index f20b3c178..374ed1d96 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "ndialog.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp b/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp index e200381ff..032db8046 100644 --- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h index 44a53d53e..85ad21697 100644 --- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "QtWidgets/QFileDialog/nfiledialog.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp index 419eb4ea7..0be6f53aa 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h index 73581730d..f6f355904 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QGridLayout/ngridlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp b/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp index 7fa83b313..b2e3780b9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h index fa2696377..e0aaffff2 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ngroupbox.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp b/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp index f492f303b..986027d8c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h index 998697d77..71079fea5 100644 --- a/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QInputDialog/ninputdialog.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp b/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp index 9fa0029b2..2705122c3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp @@ -2,8 +2,9 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" +#include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" class DLL_EXPORT NLabel : public QLabel, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h index ce8a3f1c9..5d4e1d89a 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h @@ -4,8 +4,9 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" +#include "QtWidgets/QWidget/qwidget_macro.h" #include "nlabel.hpp" class DLL_EXPORT QLabelWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp index e49e3afda..cf51888b4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h index 6da2522c2..3d3e06de0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/nlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp b/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp index baf2d3023..786567919 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h index 20c1a8f37..ad7e8ff37 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nlineedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp index af50463d1..546eee712 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QListView/qlistview_macro.h" #include "QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h index 64b51e5aa..ff1f6c8ff 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QListView/qlistview_macro.h" #include "QtWidgets/QListWidget/nlistwidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp b/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp index 02380b4a7..bde89767d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h index 9e8b49401..056c707f9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nmainwindow.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp index b81f5a1e5..1f815fd69 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" class DLL_EXPORT NMenu : public QMenu, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h index 03d686260..fd1d4186f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "nmenu.hpp" class DLL_EXPORT QMenuWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp index 6a8d21138..1fde962ad 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" class DLL_EXPORT NMenuBar : public QMenuBar, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h index a980d8a08..dd04274ab 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "nmenubar.hpp" class DLL_EXPORT QMenuBarWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp b/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp index 9d809eba4..079fe054d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "QtWidgets/QPushButton/qpushbutton_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h index 7a1ac737d..c21c7e883 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QMessageBox/nmessagebox.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h index b06440c6f..83f8c5679 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_wrap.h" class DLL_EXPORT QPainterWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp index 7d93019c0..4353a7486 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" class DLL_EXPORT NPlainTextEdit : public QPlainTextEdit, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h index fb710ae80..b3627711c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nplaintextedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp b/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp index 8d9c25ce2..c0ee6674c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h index 289459f91..e19f97171 100644 --- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nprogressbar.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp b/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp index efb967eef..35947c6a1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h index a048e1dda..92f4bd660 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "npushbutton.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp b/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp index 2ed223e2f..2415fb3a0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h index 0d0572003..bd2fc0be0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nradiobutton.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp b/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp index 4ce9df0c4..ce8254bc3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h index 7dfd639cd..1c3022e9e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "nscrollarea.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp b/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp index fb4e0f340..8266cd6e9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h index 5acb222df..ffd8c9a1c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nscrollbar.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp b/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp index 933db17f6..777548c38 100644 --- a/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h index ae4c14fe5..052f962dc 100644 --- a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nshortcut.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp b/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp index 2f844f3e4..ae3e2d9f5 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h index ff1c463a7..653ec702c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nslider.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp b/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp index d6865f0a2..e07ee9d31 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSpinBox/qabstractspinbox_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h index 4e87f7294..e26389542 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSpinBox/qabstractspinbox_macro.h" #include "nspinbox.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp index c05629e4e..052f5a70f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp @@ -2,8 +2,9 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" +#include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h index f141d8dcd..e29fed9d6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" #include "QtWidgets/QStackedWidget/nstackedwidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp b/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp index bb5220276..598b5563d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h index 4d471663d..eaa6a774e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nstatusbar.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp index 7664017ce..4f8c2a7a8 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h index c13284c4c..1fcdf9695 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nsystemtrayicon.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp index 26fc9597a..1c3bf656d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h index dc98676de..88f96f8c0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QTabWidget/ntabwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp index e90af88fb..27bc11064 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h index aa5460940..79984bc2d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QTableWidget/ntablewidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h index b870edffd..06a22db24 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_wrap.h" class DLL_EXPORT QTableWidgetItemWrap diff --git a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp index 5b2349ad1..0879c84e6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h index 3a0f8de43..fe322e4d4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ntimeedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp index e6e42d835..ac8a5fa51 100644 --- a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp @@ -3,7 +3,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QAction/qaction_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h index b9f052c11..fe3f765e7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ntoolbutton.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp index 23774928a..7a1756383 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h index 8febe97ec..b8c5720b4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ntreewidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h index 911696372..50db3433b 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_wrap.h" class DLL_EXPORT QTreeWidgetItemWrap diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp index a177e06cd..47fc2f436 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp @@ -4,7 +4,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h index b8d0a5b78..baec964da 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nwidget.hpp" diff --git a/src/cpp/include/nodegui/core/Component/component_wrap.h b/src/cpp/include/nodegui/core/Component/component_wrap.h index 906f5b16b..42628994c 100644 --- a/src/cpp/include/nodegui/core/Component/component_wrap.h +++ b/src/cpp/include/nodegui/core/Component/component_wrap.h @@ -9,7 +9,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "component_macro.h" class DLL_EXPORT ComponentWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/core/Events/eventsmap.h b/src/cpp/include/nodegui/core/Events/eventsmap.h index 7783e92bd..2e0cdf50a 100644 --- a/src/cpp/include/nodegui/core/Events/eventsmap.h +++ b/src/cpp/include/nodegui/core/Events/eventsmap.h @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" class DLL_EXPORT EventsMap { public: diff --git a/src/cpp/include/nodegui/core/Events/eventwidget.h b/src/cpp/include/nodegui/core/Events/eventwidget.h index aad98c5f3..eedc23807 100644 --- a/src/cpp/include/nodegui/core/Events/eventwidget.h +++ b/src/cpp/include/nodegui/core/Events/eventwidget.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Events/eventsmap.h" class DLL_EXPORT EventWidget { diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexitem.h b/src/cpp/include/nodegui/core/FlexLayout/flexitem.h index 0a30697b9..47921cfc2 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexitem.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexitem.h @@ -1,6 +1,6 @@ #pragma once -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "deps/yoga/YGNode.h" /* diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp b/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp index 1419a68c7..bf9524d37 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp +++ b/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" #include "deps/yoga/YGNode.h" diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h b/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h index 0b105ec48..b5b8f4866 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "flexlayout.hpp" diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexutils.h b/src/cpp/include/nodegui/core/FlexLayout/flexutils.h index 2a0a014b6..65cb1eeaf 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexutils.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexutils.h @@ -3,7 +3,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "deps/yoga/YGNode.h" class DLL_EXPORT FlexNodeContext { diff --git a/src/cpp/include/nodegui/core/Integration/integration.h b/src/cpp/include/nodegui/core/Integration/integration.h new file mode 100644 index 000000000..aa23f964d --- /dev/null +++ b/src/cpp/include/nodegui/core/Integration/integration.h @@ -0,0 +1,4 @@ +#pragma once +namespace qodeIntegration { +void integrate(); +} \ No newline at end of file diff --git a/src/cpp/include/nodegui/core/Integration/qode-api.h b/src/cpp/include/nodegui/core/Integration/qode-api.h new file mode 100644 index 000000000..e5315b62b --- /dev/null +++ b/src/cpp/include/nodegui/core/Integration/qode-api.h @@ -0,0 +1,15 @@ +#ifdef _WIN32 +#define QODE_IMPORT __declspec(dllimport) +#else +#define QODE_IMPORT +#endif + +#pragma once +// From Qode headers +namespace qode { +QODE_IMPORT extern int qode_argc; +QODE_IMPORT extern char **qode_argv; +QODE_IMPORT typedef int (*QodeCustomRunLoopFunc)(); +QODE_IMPORT extern void InjectCustomRunLoop( + QodeCustomRunLoopFunc customRunLoop); +} // namespace qode \ No newline at end of file diff --git a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h index 7def0fae3..43c31749e 100644 --- a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h +++ b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h @@ -1,5 +1,5 @@ #pragma once -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Events/eventwidget_macro.h" #include "core/YogaWidget/yogawidget.h" diff --git a/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h b/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h index 8ed8235bf..a51eb682e 100644 --- a/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h +++ b/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h @@ -3,7 +3,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "deps/yoga/YGStyle.h" /* diff --git a/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h b/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h index 2a0a050ee..c823cfd36 100644 --- a/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h +++ b/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/FlexLayout/flexitem.h" #include "nodestyle.h" diff --git a/src/cpp/lib/Extras/Utils/nutils.cpp b/src/cpp/lib/Extras/Utils/nutils.cpp index d0daff2e6..1a3aa8fd0 100644 --- a/src/cpp/lib/Extras/Utils/nutils.cpp +++ b/src/cpp/lib/Extras/Utils/nutils.cpp @@ -1,8 +1,6 @@ #include "Extras/Utils/nutils.h" #include -#include -#include #include #include #include @@ -89,14 +87,6 @@ void* extrautils::configureQWidget(QWidget* widget, YGNodeRef node, return configureQObject(widget); } -void extrautils::initAppSettings() { - QFont f = QApplication::font(); - if (f.defaultFamily().isEmpty()) { - f.setFamily("Sans-Serif"); - QApplication::setFont(f); - } -} - Napi::FunctionReference NUtilsWrap::constructor; Napi::Object NUtilsWrap::init(Napi::Env env, Napi::Object exports) { diff --git a/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp b/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp index 6be4cc239..67543b7d1 100644 --- a/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp +++ b/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp @@ -3,10 +3,9 @@ #include "Extras/Utils/nutils.h" #include "QtGui/QClipboard/qclipboard_wrap.h" #include "QtGui/QStyle/qstyle_wrap.h" +#include "core/Integration/qode-api.h" Napi::FunctionReference QApplicationWrap::constructor; -int QApplicationWrap::argc = 0; -char** QApplicationWrap::argv = NULL; Napi::Object QApplicationWrap::init(Napi::Env env, Napi::Object exports) { Napi::HandleScope scope(env); @@ -24,7 +23,7 @@ Napi::Object QApplicationWrap::init(Napi::Env env, Napi::Object exports) { StaticMethod("instance", &StaticQApplicationWrapMethods::instance), StaticMethod("clipboard", &StaticQApplicationWrapMethods::clipboard), StaticMethod("style", &StaticQApplicationWrapMethods::style), - COMPONENT_WRAPPED_METHODS_EXPORT_DEFINE(QApplicationWrap)}); + QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QApplicationWrap)}); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); return exports; @@ -35,9 +34,9 @@ QApplicationWrap::QApplicationWrap(const Napi::CallbackInfo& info) Napi::Env env = info.Env(); Napi::HandleScope scope(env); if (info.Length() == 1) { - this->instance = info[0].As>().Data(); + this->instance = info[0].As>().Data(); } else if (info.Length() == 0) { - this->instance = new QApplication(this->argc, this->argv); + this->instance = new NApplication(qode::qode_argc, qode::qode_argv); this->_wasManuallyCreated = true; } else { Napi::TypeError::New(env, "Wrong number of arguments") @@ -51,7 +50,7 @@ QApplicationWrap::~QApplicationWrap() { } } -QApplication* QApplicationWrap::getInternalInstance() { return this->instance; } +NApplication* QApplicationWrap::getInternalInstance() { return this->instance; } Napi::Value QApplicationWrap::processEvents(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); @@ -86,9 +85,9 @@ Napi::Value StaticQApplicationWrapMethods::instance( const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); Napi::HandleScope scope(env); - QApplication* app = static_cast(QCoreApplication::instance()); + NApplication* app = static_cast(QCoreApplication::instance()); Napi::Object instance = QApplicationWrap::constructor.New( - {Napi::External::New(env, app)}); + {Napi::External::New(env, app)}); return instance; } diff --git a/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp b/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp index 80723a179..990485e86 100644 --- a/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp +++ b/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp @@ -1,5 +1,6 @@ #include "QtGui/QKeySequence/qkeysequence_wrap.h" +#include "Extras/Utils/nutils.h" #include "QtCore/QVariant/qvariant_wrap.h" #include "QtGui/QPixmap/qpixmap_wrap.h" diff --git a/src/cpp/lib/core/FlexLayout/flexlayout.cpp b/src/cpp/lib/core/FlexLayout/flexlayout.cpp index 47dff4717..e2ecfb7f7 100644 --- a/src/cpp/lib/core/FlexLayout/flexlayout.cpp +++ b/src/cpp/lib/core/FlexLayout/flexlayout.cpp @@ -3,7 +3,6 @@ #include #include -#include "Extras/Utils/nutils.h" #include "core/FlexLayout/flexitem.h" #include "core/FlexLayout/flexutils.h" #include "core/YogaWidget/yogawidget.h" diff --git a/src/cpp/lib/core/Integration/integration.cpp b/src/cpp/lib/core/Integration/integration.cpp new file mode 100644 index 000000000..ade308e0c --- /dev/null +++ b/src/cpp/lib/core/Integration/integration.cpp @@ -0,0 +1,30 @@ + +#include "core/Integration/integration.h" + +#include + +#include "QtGui/QApplication/napplication.hpp" +#include "core/Integration/qode-api.h" +namespace qodeIntegration { +static NApplication* app; + +int QtRunLoopWrapper() { + int exitCode = app->exec(); + // if(exitCode != 0){ + exit(exitCode); + // } + return 0; +} + +void integrate() { + // Bootstrap Qt + app = new NApplication(qode::qode_argc, qode::qode_argv); + qode::InjectCustomRunLoop(&QtRunLoopWrapper); + // Other init settings + QFont f = QApplication::font(); + if (f.defaultFamily().isEmpty()) { + f.setFamily("Sans-Serif"); + QApplication::setFont(f); + } +} +} // namespace qodeIntegration \ No newline at end of file diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index e07c4f0ee..10a94895d 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -73,9 +73,10 @@ #include "QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h" #include "QtWidgets/QWidget/qwidget_wrap.h" #include "core/FlexLayout/flexlayout_wrap.h" +#include "core/Integration/integration.h" // These cant be instantiated in JS Side void InitPrivateHelpers(Napi::Env env) { - extrautils::initAppSettings(); + qodeIntegration::integrate(); QLayoutWrap::init(env); // Abstact class wrapper for pointing to any layout } diff --git a/src/index.ts b/src/index.ts index af3b816bc..0113de547 100644 --- a/src/index.ts +++ b/src/index.ts @@ -94,7 +94,7 @@ export { QPoint } from './lib/QtCore/QPoint'; export { QColor } from './lib/QtGui/QColor'; export { QTime } from './lib/QtCore/QTime'; export { QUrl, ParsingMode } from './lib/QtCore/QUrl'; -export { Format, Scope, QSettings } from './lib/QtCore/QSettings'; +export { QSettings, QSettingsFormat, QSettingsScope } from './lib/QtCore/QSettings'; // Layouts: export { QBoxLayout, QBoxLayoutSignals } from './lib/QtWidgets/QBoxLayout'; export { QGridLayout, QGridLayoutSignals } from './lib/QtWidgets/QGridLayout'; diff --git a/src/lib/QtCore/QSettings.ts b/src/lib/QtCore/QSettings.ts index 95465dd30..4e4056f8a 100644 --- a/src/lib/QtCore/QSettings.ts +++ b/src/lib/QtCore/QSettings.ts @@ -2,7 +2,7 @@ import { NativeElement, Component } from '../core/Component'; import addon from '../utils/addon'; import { QVariant } from './QVariant'; -export enum Format { +export enum QSettingsFormat { NativeFormat = 0, Registry32Format = 2, Registry64Format = 3, @@ -10,7 +10,7 @@ export enum Format { InvalidFormat = 16, } -export enum Scope { +export enum QSettingsScope { UserScope = 0, SystemScope = 1, } diff --git a/src/lib/QtGui/QApplication.ts b/src/lib/QtGui/QApplication.ts index a146c4226..ba7323e95 100644 --- a/src/lib/QtGui/QApplication.ts +++ b/src/lib/QtGui/QApplication.ts @@ -1,8 +1,9 @@ import addon from '../utils/addon'; -import { Component, NativeElement } from '../core/Component'; +import { NativeElement } from '../core/Component'; import { checkIfNativeElement } from '../utils/helpers'; import { QClipboard } from './QClipboard'; import { QStyle } from './QStyle'; +import { QObjectSignals, NodeObject } from '../QtCore/QObject'; /** @@ -21,17 +22,19 @@ const qApp = QApplication.instance(); qApp.quit(); ``` */ -export class QApplication extends Component { +export class QApplication extends NodeObject { native: NativeElement; constructor(); constructor(native: NativeElement); constructor(arg?: NativeElement) { - super(); + let native: NativeElement; if (checkIfNativeElement(arg)) { - this.native = arg as NativeElement; + native = arg as NativeElement; } else { - this.native = new addon.QApplication(); + native = new addon.QApplication(); } + super(native); + this.native = native; } static clipboard(): QClipboard { return new QClipboard(addon.QApplication.clipboard()); @@ -62,3 +65,5 @@ export class QApplication extends Component { return new QStyle(addon.QApplication.style()); } } + +export type QApplicationSignals = QObjectSignals;