diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-14 12:15:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-18 12:44:01 +0200 |
| commit | ea2ea1c624f40bfc5cd3f4c9f9654e31c0aacf33 (patch) | |
| tree | 2f68400d62205272fe205ec4ae8c0c53427ad729 | |
| parent | 1bef04179cc68232815307f3cfd7a28aa0277fd9 (diff) | |
remove mentions of borland from project files
Change-Id: I4a819e6fa95d3e229d82a286ba212fc7cb572a5c
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/activeqt/control/control.pro | 1 | ||||
| -rw-r--r-- | tools/testcon/testcon.pro | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 427e8ec..f74d525 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -16,7 +16,6 @@ DESTDIR = $$QT.activeqt.libs DEFINES += QAX_SERVER win32-g++*:DEFINES += QT_NEEDS_QMAIN -win32-borland:DEFINES += QT_NEEDS_QMAIN LIBS += -luser32 -lole32 -loleaut32 -lgdi32 win32-g++*:LIBS += -luuid diff --git a/tools/testcon/testcon.pro b/tools/testcon/testcon.pro index f6b4d65..a6afddf 100644 --- a/tools/testcon/testcon.pro +++ b/tools/testcon/testcon.pro @@ -8,12 +8,7 @@ HEADERS = docuwindow.h mainwindow.h invokemethod.h changeproperties.h ambientpr FORMS = mainwindow.ui invokemethod.ui changeproperties.ui ambientproperties.ui controlinfo.ui $$QT.activeqt.sources/container/qaxselect.ui RC_FILE = testcon.rc -win32-borland { - QMAKE_POST_LINK = -midl $$QT.activeqt.sources/../../tools/testcon/testcon.idl -} else { - !win32-g++*:QMAKE_POST_LINK = midl $$QT.activeqt.sources/../../tools/testcon/testcon.idl && move testcon.tlb $(TARGETDIR) - -} +!win32-g++*:QMAKE_POST_LINK = midl $$QT.activeqt.sources/../../tools/testcon/testcon.idl && move testcon.tlb $(TARGETDIR) target.path = $$[QT_INSTALL_BINS] INSTALLS += target |