Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7534 in orxonox.OLD


Ignore:
Timestamp:
May 4, 2006, 3:14:25 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: QT-4 works on Tardis

Location:
branches/qt_gui
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/qt_gui/acinclude.m4

    r7528 r7534  
    8282    _lib_check=""
    8383    _found_lib=""
     84    QT_PREFIX="$1"
    8485
    8586
    86     QT_PREFIX="$1"
    8787    QT_LIBS=""
    8888    QT_CXXFLAGS="-I${QT_PREFIX}/include"
    89     QT_LDFLAGS="-L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/lib"
     89    LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/lib"
    9090    QT_BIN_DIR="${QT_PREFIX}/bin"
    91     QT_COMMON_INCLUDE_DIRECTORIES=/usr/include `ls -dr /usr/include/qt*` `ls -dr /usr/lib/qt*/include` `ls -dr /usr/local/qt*/include` `ls -dr /opt/qt*/include` `ls -dr /Developer/qt*/include`
    92     QT_COMMON_LIB_DIRECTORIES=/usr/lib `ls -dr /usr/lib/qt*` `ls -dr /usr/local/qt*/lib` `ls -dr /opt/qt*/lib` `ls -dr/Developer/qt*/lib`
     91
     92    QT_COMMON_INCLUDE_DIRECTORIES="/usr/include
     93      `ls -dr ${QTDIR}/include         2>/dev/null`
     94      `ls -dr /usr/include/qt*         2>/dev/null`
     95      `ls -dr /usr/lib/qt*/include     2>/dev/null`
     96      `ls -dr /usr/local/qt*/include   2>/dev/null`
     97      `ls -dr /opt/qt*/include         2>/dev/null`
     98      `ls -dr /Developer/qt*/include   2>/dev/null`
     99    "
     100
     101    QT_COMMON_LIB_DIRECTORIES=""
    93102
    94103    CACHED_CPPFLAG=${CPPFLAGS}
    … …  
    107116    if [test "x$_lib_check" = "xyes"] ; then
    108117         QT_LIBS="${QT_LIBS} -l$_found_lib"
     118         AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
     119         AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
     120#         AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4],,,[http://www.trolltech.com] )
     121
    109122         $3
    110123    else
    … …  
    116129         exit -1
    117130    fi
     131
     132    echo "QT_LIBS = ${QT_LIBS}"
     133    echo "QT_CXXFLAGS = ${QT_CXXFLAGS}"
     134    echo "QT_LD_FLAGS = ${QT_LDFLAGS}"
     135
    118136    AC_SUBST([QT_LIBS])
    119137    AC_SUBST([QT_CXXFLAGS])

  • branches/qt_gui/configure.ac

    r7528 r7534  
    236236
    237237  ## QT
    238   QT_PREFIX=/usr/pack/qt-3.3.3-mo
    239   CPPFLAGS="${CPPFLAGS} -I${PREFIX_QT}/${ARCH}/include"
    240   LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/${ARCH}/lib -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
    241   QT_BIN_DIR="${PREFIX_QT}/${ARCH}/bin"
    242 
    243 
    244 
    245   QT_PREFIX=/usr/pack/qt-3.3.3-mo
    246   QTDIR="${QT_PREFIX}/${ARCH}"
    247   LDFLAGS="${LDFLAGS} -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
     238  QT_PREFIX=/usr/pack/qt-4.1.1-mo/${ARCH}
     239#  CPPFLAGS="${CPPFLAGS} -I${PREFIX_QT}/include"
     240#  LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
     241
    248242
    249243
    … …  
    579573# QT #
    580574#----#
    581 AX_CHECK_QT([${QTDIR}], [qt-mt],, [http://www.trolltech.com])
     575AX_CHECK_QT([${QT_PREFIX}], [QtCore],, [http://www.trolltech.com])
    582576if test x$have_qt = xno ; then
    583577    WITH_QT=no
    584 ##else
    585 #  AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
    586 #  AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
    587 #  AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] )
    588 
    589578fi
    590579

  • branches/qt_gui/src/lib/gui/qt_gui/gui_audio.cc

    r7495 r7534  
    2727#include "gui_audio.h"
    2828
    29 #include <qlayout.h>
     29#include <QtGui/QLayout>
    3030#include "sdlincl.h"
    3131#include "debug.h"
    3232
    33 #include <qpushbutton.h>
    34 #include <qcheckbox.h>
    35 #include <qcombobox.h>
     33#include <QtGui/QPushButton>
     34#include <QtGui/QCheckBox>
     35#include <QtGui/QComboBox>
    3636
    3737namespace OrxGui
    … …  
    4646
    4747    {
    48       QCheckBox* fullscreen = new QCheckBox(QString("Enabled"), this);
     48      QCheckBox* fullscreen = new QCheckBox(QString("Enabled"));
    4949      //fullscreen->setName();
    5050      layout->addWidget(fullscreen, 0, 0);
    5151
    52       QCheckBox* wireframe = new QCheckBox("Test", this);
     52      QCheckBox* wireframe = new QCheckBox("Test");
    5353      layout->addWidget(wireframe, 1, 0);
    5454
    55       QComboBox* resolution = new QComboBox("SecondTest", this);
     55      QComboBox* resolution = new QComboBox();
    5656      layout->addWidget(resolution, 2, 0);
    5757

  • branches/qt_gui/src/lib/gui/qt_gui/gui_audio.h

    r7495 r7534  
    99#include <vector>
    1010#include <string>
    11 #include <qgroupbox.h>
     11#include <QtGui/QGroupBox>
    1212
    1313namespace OrxGui

  • branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc

    r7531 r7534  
    2727#include "gui_video.h"
    2828
    29 #include <qlayout.h>
     29#include <QtGui/QLayout>
    3030#include "sdlincl.h"
    3131#include "debug.h"
    3232
    33 #include <qpushbutton.h>
    34 #include <qcheckbox.h>
    35 #include <qcombobox.h>
     33
     34#include <QtGui/QPushButton>
     35#include <QtGui/QCheckBox>
     36#include <QtGui/QComboBox>
    3637
    3738namespace OrxGui
    … …  
    5455
    5556      {
    56         QComboBox* resolution = new QComboBox("Resolution", this);
     57        QComboBox* resolution = new QComboBox();
    5758        layout->addWidget(resolution, 2, 0);
    5859        std::vector<QString> resolutions;
    5960        this->getResolutions(resolutions);
    6061        for (unsigned int i = 0; i < resolutions.size(); ++i)
    61           resolution->insertItem(resolutions[i]);
     62          resolution->addItem(resolutions[i]);
    6263      }
    6364
    … …  
    148149          PRINTF(5)("  %d x %d\n", modes[i]->w, modes[i]->h);
    149150          sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
    150           resolutionList.push_back(std::string(tmpChar));
     151          resolutionList.push_back(QString(tmpChar));
    151152          x = modes[i]->w; y = modes[i]->h;
    152153        }

  • branches/qt_gui/src/lib/gui/qt_gui/gui_video.h

    r7531 r7534  
    99#include <vector>
    1010#include <string>
    11 #include <qgroupbox.h>
     11#include <QtGui/QGroupBox>
    1212
    1313namespace OrxGui

  • branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

    r7531 r7534  
    1818#include "qt_gui.h"
    1919
    20 #include <qapplication.h>
    21 #include <qgroupbox.h>
    22 #include <qlayout.h>
    23 #include <qtoolbox.h>
     20#include <QtGui/QApplication>
     21#include <QtGui/QToolBox>
     22#include <QtGui/QGridLayout>
    2423
    25 #include <qpushbutton.h>
    26 #include <qcombobox.h>
    2724
    2825#include "gui_video.h"

  • branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h

    r7493 r7534  
    99#include "../gui.h"
    1010#include "../gui_element.h"
    11 #include <qapplication.h>
    12 #include <qmainwindow.h>
     11#include <QtGui/QApplication>
     12#include <QtGui/QMainWindow>
    1313
    1414namespace OrxGui
Note: See TracChangeset for help on using the changeset viewer.