qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix static builds 

Make sure right dependencies are built and resources are loaded

Change-Id: Ia3693c2d0df8849c544a9b6d346168cd4569a26c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Mike Krus 2016-04-27 10:24:41 +01:00
parent 8d6a2dcffd
commit 290c9d1088
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/qt3d/examples-common/examples-common.pri
View File

@ -10,11 +10,11 @@ win32 {
common_static_lib = $$OUT_PWD/../examples-common/release/$${QMAKE_PREFIX_STATICLIB}examples-common.$${QMAKE_EXTENSION_STATICLIB}
}
}
LIBS += $$common_static_lib
PRE_TARGETDEPS += $$common_static_lib
} else {
common_static_lib = $$OUT_PWD/../examples-common/$${QMAKE_PREFIX_STATICLIB}examples-common.$${QMAKE_EXTENSION_STATICLIB}
LIBS += -L$$OUT_PWD/../examples-common -l$$qtLibraryTarget(examples-common)
PRE_TARGETDEPS += $$OUT_PWD/../examples-common/lib$$qtLibraryTarget(examples-common).a
}
LIBS += $$common_static_lib
PRE_TARGETDEPS += $$common_static_lib
RESOURCES += $$OUT_PWD/../examples-common/examples-common.qrc

2
examples/qt3d/examples-common/examples-common.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += staticlib
TARGET = examples-common
TARGET = $$qtLibraryTarget(examples-common)
QT += core-private 3dcore 3dcore-private 3drender 3dinput 3dlogic qml quick 3dextras
SOURCES += \

2
src/quick3d/imports/extras/importsextras.pro
View File

@ -2,7 +2,7 @@ CXX_MODULE = qml
TARGET = quick3dextrasplugin
TARGETPATH = Qt3D/Extras
QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras
QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic
HEADERS += \
qt3dquick3dextrasplugin.h

1
src/quick3d/imports/extras/qmldir
View File

@ -1,3 +1,4 @@
module Qt3D.Extras
plugin quick3dextrasplugin
classname Qt3DQuick3DExtrasPlugin
depends Qt3D.Logic 2.0

4
src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
View File

@ -45,7 +45,9 @@
static void initResources()
{
#ifdef QT_STATIC
Q_INIT_RESOURCE(qmake_Qt3D_Core);
Q_INIT_RESOURCE(qmake_Qt3D_Extras);
Q_INIT_RESOURCE(defaults);
Q_INIT_RESOURCE(extras);
#endif
}