summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-03-28 22:05:37 (UTC)
committer mickeyl <mickeyl>2004-03-28 22:05:37 (UTC)
commit780fbf818882654e9a7e5fac6fc1bc9022bb31f3 (patch) (side-by-side diff)
tree1159f04d41bb3ecf18919756d98a14d45195d883
parent6fff64e27b026f793141d2b673c862f92172d501 (diff)
downloadopie-780fbf818882654e9a7e5fac6fc1bc9022bb31f3.zip
opie-780fbf818882654e9a7e5fac6fc1bc9022bb31f3.tar.gz
opie-780fbf818882654e9a7e5fac6fc1bc9022bb31f3.tar.bz2
revert accidental commit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/qws/linux-generic-g++/qmake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index add69b3..2610b12 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -28,34 +28,34 @@ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
QMAKE_INCDIR =
QMAKE_LIBDIR =
QMAKE_INCDIR_X11 =
QMAKE_LIBDIR_X11 =
QMAKE_INCDIR_QT = $(QTDIR)/include
QMAKE_LIBDIR_QT = $(QTDIR)/lib
QMAKE_INCDIR_OPENGL = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-QMAKE_LINK = gcc
-QMAKE_LINK_SHLIB = gcc
+QMAKE_LINK = g++
+QMAKE_LINK_SHLIB = g++
QMAKE_LFLAGS = $(LFLAGS_EXTRA)
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_SHLIB = -shared
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
QMAKE_RPATH = -Wl,-rpath,
QMAKE_LIBS = $(LIBS_EXTRA)
QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 =
QMAKE_LIBS_X11SM =
QMAKE_LIBS_QT = -lqte
QMAKE_LIBS_QT_THREAD = -lqte-mt
QMAKE_LIBS_QT_OPENGL = -lqgl