diff --git a/QQt.pro b/QQt.pro index 4fac5ef7..8181576a 100644 --- a/QQt.pro +++ b/QQt.pro @@ -37,7 +37,9 @@ SUBDIRS += test/svgtest SUBDIRS += test/framelesshelperwidget SUBDIRS += test/treeviewtest SUBDIRS += test/qqtdicttest -SUBDIRS += test/cmdwidget +!contains(QKIT_PRIVATE, iOS|iOSSimulator){ + SUBDIRS += test/cmdwidget +} SUBDIRS += test/coretest #----------------------------------------------------------------- diff --git a/examples/qqtframe2/link_qqt_library.pri b/examples/qqtframe2/link_qqt_library.pri index 60899c4c..72fadea3 100644 --- a/examples/qqtframe2/link_qqt_library.pri +++ b/examples/qqtframe2/link_qqt_library.pri @@ -1,6 +1,9 @@ #here is all your app common defination and configration #you can modify this pri to link qqt_library +#this link need Qt Creator set default build directory, replace +#%{JS: Util.asciify("/your/local/path/to/build/root/%{CurrentProject:Name}/%{Qt:Version}/%{CurrentKit:FileSystemName}/%{CurrentBuild:Name}")} + equals(QMAKE_HOST.os, Darwin) { QQT_SOURCE_ROOT = $$PWD/../../ } else: equals(QMAKE_HOST.os, Linux) { @@ -9,26 +12,33 @@ equals(QMAKE_HOST.os, Darwin) { QQT_SOURCE_ROOT = $$PWD/../../ } +equals(QMAKE_HOST.os, Darwin) { + QQT_BUILD_ROOT = /Users/abel/Develop/c0-buildstation +} else: equals(QMAKE_HOST.os, Linux) { + QQT_BUILD_ROOT = /home/abel/Develop/c0-buildstation +} else: equals(QMAKE_HOST.os, Windows) { + QQT_BUILD_ROOT = C:/Users/Administrator/Develop/c0-build +} + #qqt qkit include($${QQT_SOURCE_ROOT}/src/qqt_kit.pri) #qqt version include($${QQT_SOURCE_ROOT}/src/qqt_version.pri) -#link QQt static library in some occation +#link QQt static library in some occation on windows equals(QKIT_PRIVATE, WIN32) { #Qt is static by mingw32 building mingw{ DEFINES += QQT_STATIC_LIBRARY } -} - -contains(DEFINES, QQT_STATIC_LIBRARY) { - DEFINES += QCUSTOMPLOT_STATIC_LIBRARY - DEFINES += QZXING_STATIC_LIBRARY - DEFINES += QT_QTSOAP_STATIC_LIBRARY - DEFINES += BUILD_QDEVICEWATCHER_STATIC - DEFINES += QT_QTMMLWIDGET_STATIC_LIBRARY + contains(DEFINES, QQT_STATIC_LIBRARY) { + DEFINES += QCUSTOMPLOT_STATIC_LIBRARY + DEFINES += QZXING_STATIC_LIBRARY + DEFINES += QT_QTSOAP_STATIC_LIBRARY + DEFINES += BUILD_QDEVICEWATCHER_STATIC + DEFINES += QT_QTMMLWIDGET_STATIC_LIBRARY + } } #qqt header @@ -38,9 +48,11 @@ include($${QQT_SOURCE_ROOT}/src/qqt_header.pri) #CONFIG += BUILD_SRC contains (CONFIG, BUILD_SRC) { #if you want to build src but not link QQt in your project + #if you don't want to modify Qt Creator's default build directory, this maybe a choice. include($${QQT_SOURCE_ROOT}/src/qqt_source.pri) } else { #QKIT_PRIVATE from qqt_header.pri + #MOD: QQT_BUILD_ROOT contains(QKIT_PRIVATE, WIN32|WIN64) { CONFIG += link_from_build } else:contains(QKIT_PRIVATE, iOS|iOSSimulator) { @@ -54,16 +66,6 @@ contains (CONFIG, BUILD_SRC) { CONFIG += link_from_sdk } - contains(CONFIG, link_from_build) { - equals(QMAKE_HOST.os, Darwin) { - QQT_BUILD_ROOT = /Users/abel/Develop/c0-buildstation - } else: equals(QMAKE_HOST.os, Linux) { - QQT_BUILD_ROOT = /home/abel/Develop/c0-buildstation - } else: equals(QMAKE_HOST.os, Windows) { - QQT_BUILD_ROOT = C:/Users/Administrator/Develop/c0-build - } - } - #if you want to link QQt library include($${QQT_SOURCE_ROOT}/src/qqt_library.pri) } diff --git a/src/exquisite/qrcode/qrdecode/zxing/zxing/ZXing.h b/src/exquisite/qrcode/qrdecode/zxing/zxing/ZXing.h index 5087f27c..5c2341b8 100644 --- a/src/exquisite/qrcode/qrdecode/zxing/zxing/ZXing.h +++ b/src/exquisite/qrcode/qrdecode/zxing/zxing/ZXing.h @@ -63,10 +63,13 @@ inline bool isnan_z ( double v ) { //std::? x //:: y +#ifdef __ANDROIDX86__ return ( ( sizeof ( v ) == sizeof ( float ) ) ? isnanf ( v ) : ( sizeof ( v ) == sizeof ( double ) ) ? isnan ( v ) : __isnanl ( v ) ); - //return isnan ( v ); +#else + return isnan ( v ); +#endif } inline float nan() {return std::numeric_limits::quiet_NaN();} diff --git a/src/qqt_kit.pri b/src/qqt_kit.pri index 50207a6d..da2d9d76 100644 --- a/src/qqt_kit.pri +++ b/src/qqt_kit.pri @@ -46,13 +46,14 @@ equals(QKIT_PRIVATE, EMBEDDED) { DEFINES += __ANDROID__ } else:equals(QKIT_PRIVATE, ANDROIDX86) { DEFINES += __ANDROID__ + DEFINES += __ANDROIDX86__ } -#QMAKESPEC_NAME = $${QMAKESPEC} -#QMAKESPEC_NAME ~= s@^/.*/([^/]+)/?@\1@g -#QMAKESPECS = $${QMAKESPEC} -#QMAKESPECS ~= s:/[^/]*$::p -#message ($$QMAKESPEC_NAME $$QMAKESPECS) +QMAKESPEC_NAME = $${QMAKESPEC} +QMAKESPEC_NAME ~= s@^/.*/([^/]+)/?@\1@g +QMAKESPECS = $${QMAKESPEC} +QMAKESPECS ~= s:/[^/]*$::p +message (used spec: $$QMAKESPEC_NAME at here: $$QMAKESPECS ) #equals(QMAKESPEC_NAME, EMBEDDED) { # #embedded common macro # DEFINES += __EMBEDDED_LINUX__ diff --git a/src/qqt_library.pri b/src/qqt_library.pri index 14943a2f..3088bc8d 100644 --- a/src/qqt_library.pri +++ b/src/qqt_library.pri @@ -14,8 +14,6 @@ message(Link QQt to $${TARGET} $${QKIT_PRIVATE} \ at $${QT_VERSION} $${SYSNAME} $${BUILD} \ on $${QMAKE_HOST.os}) -#this configration need Qt Creator set default build directory -#%{CurrentProject:Name}/%{Qt:Version}/%{CurrentKit:FileSystemName}/%{CurrentBuild:Name}")} contains(CONFIG, link_from_build) { QQT_LIB_PWD = $${QQT_BUILD_ROOT}/$${QQT_STD_DIR}/src/$${DESTDIR} } else {