diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-17 00:29:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-17 00:29:02 (GMT) |
| commit | 5ae513c05a1b844745cc80834dac43f16bf62092 (patch) | |
| tree | b93601dd5daf3b18091069791c7d10057ffd7a92 /src/activeqt/control/control.pro | |
| parent | 7a577ff67388413a882435c5cbd1ad6d1fa8393d (diff) | |
| parent | 7b30a66b2f16a8bf8828d26b7d0b193b5dffe713 (diff) | |
| download | Qt-5ae513c05a1b844745cc80834dac43f16bf62092.zip Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.gz Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/activeqt/control/control.pro')
| -rw-r--r-- | src/activeqt/control/control.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 44eb928..361ca29 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -18,11 +18,11 @@ CONFIG += qt warn_off staticlib QTDIR_build:DESTDIR = $$QT_BUILD_TREE\\lib DEFINES += QAX_SERVER -win32-g++:DEFINES += QT_NEEDS_QMAIN +win32-g++*:DEFINES += QT_NEEDS_QMAIN win32-borland:DEFINES += QT_NEEDS_QMAIN LIBS += -luser32 -lole32 -loleaut32 -lgdi32 -win32-g++:LIBS += -luuid +win32-g++*:LIBS += -luuid HEADERS = qaxaggregated.h \ qaxbindable.h \ |