plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix linux issues

Browse Source
This commit is contained in:
Atul 2019-06-19 00:27:24 +02:00
parent 47d5aa3ec1
commit 0beebabd10
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/common.gypi
View File

@ -2,7 +2,7 @@
'includes': [],
'type': 'shared_library',
'variables': {
'qt_home_dir': '<!(echo $QN_QT_HOME_DIR)',
'qt_home_dir': '/usr/local/qt5',
},
'target_defaults': {
'cflags!': ['-fno-exceptions'],
@ -43,15 +43,20 @@
],
}],
['OS=="linux"', {
'cflags': [
'<!@(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets Qt5Test)',
],
'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other Qt5Core Qt5Gui Qt5Widgets Qt5Test)',
'include_dirs': [
'<(qt_home_dir)/include',
'<(qt_home_dir)/include/QtCore',
'<(qt_home_dir)/include/QtGui',
'<(qt_home_dir)/include/QtWidgets',
],
'libraries': [
'<!@(pkg-config --libs-only-l Qt5Core Qt5Gui Qt5Widgets Qt5Test)',
]
'<(qt_home_dir)/lib/libQt5Core.so',
'<(qt_home_dir)/lib/libQt5Gui.so',
'<(qt_home_dir)/lib/libQt5Widgets.so',
],
'cflags':[
'-fPIC'
],
}],
['OS=="win"', {
'msvs_settings': {

1
examples/calculator/index.ts
View File

@ -42,6 +42,7 @@ rootView.setStyleSheet(
`
* {
font-size: 20px;
color: white;
}
QPushButton {

6
src/cpp/Extras/Utils/utils.cpp
View File

@ -17,10 +17,10 @@ YGSize extrautils::measureQtWidget (YGNodeRef node, float width, YGMeasureMode w
if(widget){
QSize size = widget->sizeHint();
return YGSize{
.height = static_cast<float>(size.height()),
.width = static_cast<float>(size.width())
width : static_cast<float>(size.width()),
height : static_cast<float>(size.height()),
};
}
}
return YGSize{ .height = 0, .width = 0 };
return YGSize{width : 0, height : 0};
}