Changeset 846 for trunk/include/ActiveQt


Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/include/ActiveQt/ActiveQt

    r2 r846  
    66#include "qaxselect.h"
    77#include "qaxwidget.h"
     8#include "qaxtypes.h"
    89#include "qaxaggregated.h"
    910#include "qaxbindable.h"
    1011#include "qaxfactory.h"
    11 #include "qaxtypes.h"
    1212#endif

  • trunk/include/ActiveQt/headers.pri

    r561 r846  
    1 SYNCQT.HEADER_FILES = qaxbase.h qaxobject.h qaxscript.h qaxselect.h qaxwidget.h qaxaggregated.h qaxbindable.h qaxfactory.h qaxtypes.h ../../../../../../../../../../../../../../../../../../../../../include/ActiveQt/ActiveQt
    2 SYNCQT.HEADER_CLASSES = ../../../include/ActiveQt/QAxBase ../../../include/ActiveQt/QAxObject ../../../include/ActiveQt/QAxScriptEngine ../../../include/ActiveQt/QAxScript ../../../include/ActiveQt/QAxScriptManager ../../../include/ActiveQt/QAxSelect ../../../include/ActiveQt/QAxWidget ../../../include/ActiveQt/QAxAggregated ../../../include/ActiveQt/QAxBindable ../../../include/ActiveQt/QAxFactory ../../../include/ActiveQt/QAxClass
     1SYNCQT.HEADER_FILES = ../activeqt/container/qaxbase.h ../activeqt/container/qaxobject.h ../activeqt/container/qaxscript.h ../activeqt/container/qaxselect.h ../activeqt/container/qaxwidget.h ../activeqt/shared/qaxtypes.h ../activeqt/control/qaxaggregated.h ../activeqt/control/qaxbindable.h ../activeqt/control/qaxfactory.h ../../include/ActiveQt/ActiveQt
     2SYNCQT.HEADER_CLASSES = ../../include/ActiveQt/QAxBase ../../include/ActiveQt/QAxObject ../../include/ActiveQt/QAxScriptEngine ../../include/ActiveQt/QAxScript ../../include/ActiveQt/QAxScriptManager ../../include/ActiveQt/QAxSelect ../../include/ActiveQt/QAxWidget ../../include/ActiveQt/QAxAggregated ../../include/ActiveQt/QAxBindable ../../include/ActiveQt/QAxFactory ../../include/ActiveQt/QAxClass
    33SYNCQT.PRIVATE_HEADER_FILES =
Note: See TracChangeset for help on using the changeset viewer.