From 17c13e1e9dab40760ebe332b390ce60832de2db6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 15 Nov 2011 19:59:01 +0100 Subject: [PATCH] mkspecs: Remove qtopia*.prf from the mkspecs Qtopia was killed some time ago and these files do not have a direct use. Qt was embedded into the Qtopia sourcetree and it would be in the hands of the Qt Extended fork to move to Qt5 and update the buildsystem. It is unlikely that a Qt5 qmake will be used to build the Qt extended fork as a copy of Qt is embedded in the source tree. Change-Id: I2ef309c381aaf1d265ef385e85fd5c72d6205765 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qtopia.prf | 1 - mkspecs/features/qtopiainc.prf | 1 - mkspecs/features/qtopialib.prf | 2 -- mkspecs/unsupported/integrity-ghs/qmake.conf | 3 --- 4 files changed, 7 deletions(-) delete mode 100644 mkspecs/features/qtopia.prf delete mode 100644 mkspecs/features/qtopiainc.prf delete mode 100644 mkspecs/features/qtopialib.prf diff --git a/mkspecs/features/qtopia.prf b/mkspecs/features/qtopia.prf deleted file mode 100644 index 7672a8d4a9..0000000000 --- a/mkspecs/features/qtopia.prf +++ /dev/null @@ -1 +0,0 @@ -CONFIG *= qtopiainc qtopialib diff --git a/mkspecs/features/qtopiainc.prf b/mkspecs/features/qtopiainc.prf deleted file mode 100644 index 2665da5859..0000000000 --- a/mkspecs/features/qtopiainc.prf +++ /dev/null @@ -1 +0,0 @@ -INCLUDEPATH += $$QMAKE_INCDIR_QTOPIA diff --git a/mkspecs/features/qtopialib.prf b/mkspecs/features/qtopialib.prf deleted file mode 100644 index 0c5ccf1ade..0000000000 --- a/mkspecs/features/qtopialib.prf +++ /dev/null @@ -1,2 +0,0 @@ -!isEmpty(QMAKE_LIBDIR_QTOPIA):QMAKE_LIBDIR = $$QMAKE_LIBDIR_QTOPIA -LIBS += $$QMAKE_LIBS_QTOPIA diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf index 822d6bb5fa..54253edc8f 100644 --- a/mkspecs/unsupported/integrity-ghs/qmake.conf +++ b/mkspecs/unsupported/integrity-ghs/qmake.conf @@ -34,8 +34,6 @@ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include -QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LFLAGS = -lposix -livfs -lnet -lsocket -lfbdev -ldl QMAKE_LFLAGS_RELEASE = -g -Ospeed -Olink --no_commons -non_shared --link_once_templates @@ -50,7 +48,6 @@ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = QMAKE_LIBS_X11SM = -QMAKE_LIBS_QTOPIA = QMAKE_LIBS_THREAD = QMAKE_MOC = $$[QT_INSTALL_BINS]/moc