diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-11-29 10:16:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 14:14:47 +0100 |
| commit | 519d26881afc4ac25ea2444e77922a2464295bfd (patch) | |
| tree | c45f96d9e8dcb957441e998b200ff014e6d0f4cf | |
| parent | 56fcaf36e8e3197e4394522e7ab6d74317d24c99 (diff) | |
fix lib order for MinGW
Put the OLE references into the last lib of the chain.
Change-Id: I69d87098f96ed8a99e1e0fe713ad014bbd631462
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | src/activeqt/axshared.prx | 4 | ||||
| -rw-r--r-- | src/activeqt/container/container.pro | 4 | ||||
| -rw-r--r-- | src/activeqt/control/control.pro | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx index ce383d8..5c8273e 100644 --- a/src/activeqt/axshared.prx +++ b/src/activeqt/axshared.prx @@ -5,6 +5,10 @@ TARGET = ActiveQt CONFIG += static QT += gui-private +LIBS += -lole32 -loleaut32 +!wince*:LIBS += -luser32 -lgdi32 -ladvapi32 +win32-g++*:LIBS += -luuid + HEADERS = \ shared/qaxtypefunctions.h \ shared/qaxutils_p.h diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index 49bc13c..9c9d5e2 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -3,10 +3,6 @@ TARGET = QAxContainer QT += core-private gui gui-private widgets widgets-private axbase CONFIG += static -LIBS += -lole32 -loleaut32 -!wince*:LIBS += -luser32 -lgdi32 -ladvapi32 -win32-g++*:LIBS += -luuid - HEADERS = ../control/qaxaggregated.h \ qaxbase.h \ qaxwidget.h \ diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index f3d07cd..4bafbca 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -4,10 +4,6 @@ QT += core-private gui-private widgets axbase CONFIG += static DEFINES += QAX_SERVER -win32-g++*:DEFINES += QT_NEEDS_QMAIN - -LIBS += -luser32 -lole32 -loleaut32 -lgdi32 -win32-g++*:LIBS += -luuid HEADERS = qaxaggregated.h \ qaxbindable.h \ |