Ignore:
Timestamp:
May 16, 2011, 4:09:34 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/corelib/global/qglobal.h

    r846 r865  
    4545#include <stddef.h>
    4646
    47 #define QT_VERSION_STR "4.7.2"
     47#define QT_VERSION_STR "4.7."
    4848/*
    4949   QT_VERSION is (major << 16) + (minor << 8) + patch.
    5050*/
    51 #define QT_VERSION 0x040702
     51#define QT_VERSION 0x04070
    5252/*
    5353   can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
     
    5555#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
    5656
    57 #define QT_PACKAGEDATE_STR "2011-02-22"
    58 
    59 #define QT_PACKAGE_TAG "0828c69ad805406568f6eef2bffbbd54b04dea41"
     57#define QT_PACKAGEDATE_STR "2011-0"
     58
     59#define QT_PACKAGE_TAG ""
    6060
    6161#if !defined(QT_BUILD_MOC)
Note: See TracChangeset for help on using the changeset viewer.