aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldevtools/qtqmldevtoolsglobal_p.h
Commit message (Collapse)AuthorAgeFilesLines
* QmlDevTools: Define QML export macros as empty.Friedemann Kleint2015-08-181-15/+2
| | | | | | | | | | | | | | Since QmlDevTools is a static library, no exports (Q_QML_EXPORT/Q_QML_PRIVATE_EXPORT) should be specified. Fixes link errors in qmlimportscanner and lupdate with MSVC2015: Qt5QmlDevToolsd.lib(qv4value.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) public: struct QV4::VTable * __cdecl QV4::Heap::Base::vtable(void)const " (__imp_?vtable@Base@Heap@QV4@@QEBAPEAUVTable@3@XZ) referenced in function "public: bool __cdecl QV4::Managed::isEqualTo(struct QV4::Managed const *)const " (?isEqualTo@Managed@QV4@@QEBA_NPEBU12@@Z) D:\dev\5-vs15-56\qt-56\qtbase\bin\qmlimportscanner.exe : fatal error LNK1120: 1 unresolved externals Change-Id: I6125b3d1eaacadba65a90047867779252dab6fbc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix usage of QtQmlDevTools private headers on OSX with framework buildsSimon Hausmann2015-03-161-0/+69
Previously this module borrowed its private headers from QtQml, so that when writing QT += qmldevtools-private, you'd get the private headers from QtQml. This doesn't work when QtQml is built as a framework. A cleaner solution is to give this module its headers proper by letting syncqt create the forwarding headers correctly (and consequently also include them in make install). In order for this to work, the included headers themselves cannot include any headers from QtQml, which this patch also takes care of, through a centralized inclusion of qv4global_p.h. Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>