AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the package macros from qglobal.h

Browse Source 
It's the wrong place to have these.

Change-Id: I3b716317ba02ea2baf0f7053c8b16128e4c88e17
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Thiago Macieira 2012-08-28 16:47:56 +02:00 committed by Qt by Nokia
parent dcf4d152b5
commit a2f705029c
2 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -394,13 +394,6 @@ if [ -z "$QT_MAJOR_VERSION" ]; then
exit 1 exit 1
fi fi
QT_PACKAGEDATE=`grep '^# *define *QT_PACKAGEDATE_STR' "$relpath"/src/corelib/global/qglobal.h | sed -e 's,^# *define *QT_PACKAGEDATE_STR *"\([^ ]*\)"$,\1,' -e s,-,,g`
if [ -z "$QT_PACKAGEDATE" ]; then
echo "Unable to determine package date from qglobal.h: '$QT_PACKAGEDATE'"
echo "Cannot proceed"
exit 1
fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# check the license # check the license
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -3392,20 +3385,6 @@ elif [ "$Edition" != "OpenSource" ]; then
if [ "$Today" -gt "$ExpiryDate" ]; then if [ "$Today" -gt "$ExpiryDate" ]; then
case "$LicenseType" in case "$LicenseType" in
Commercial|Academic|Educational) Commercial|Academic|Educational)
if [ "$QT_PACKAGEDATE" -gt "$ExpiryDate" ]; then
echo
echo "NOTICE NOTICE NOTICE NOTICE"
echo
echo " Your support and upgrade period has expired."
echo
echo " You are no longer licensed to use this version of Qt."
echo " Please contact qt-info@nokia.com to renew your support"
echo " and upgrades for this license."
echo
echo "NOTICE NOTICE NOTICE NOTICE"
echo
exit 1
else
echo echo
echo "WARNING WARNING WARNING WARNING" echo "WARNING WARNING WARNING WARNING"
echo echo
@ -3423,7 +3402,6 @@ elif [ "$Edition" != "OpenSource" ]; then
echo "WARNING WARNING WARNING WARNING" echo "WARNING WARNING WARNING WARNING"
echo echo
sleep 3 sleep 3
fi
;; ;;
Evaluation|*) Evaluation|*)
echo echo

4
src/corelib/global/qglobal.h
View File

@ -55,10 +55,6 @@
*/ */
#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) #define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
#define QT_PACKAGEDATE_STR "YYYY-MM-DD"
#define QT_PACKAGE_TAG ""
#if !defined(QT_BUILD_MOC) #if !defined(QT_BUILD_MOC)
#include <QtCore/qconfig.h> #include <QtCore/qconfig.h>
#endif #endif